------------------------------------------------------------
revno: 240
committer: Michal Hruby <michal....@gmail.com>
branch nick: bluebird
timestamp: Wed 2011-09-14 21:46:32 +0200
message:
  Fix up some issues with DSR
modified:
  extensions/ds-registry.vala
  src/utils.vala


--
lp:~zeitgeist/zeitgeist/bluebird
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird

Your team Zeitgeist Framework Team is subscribed to branch 
lp:~zeitgeist/zeitgeist/bluebird.
To unsubscribe from this branch go to 
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala	2011-09-05 22:00:16 +0000
+++ extensions/ds-registry.vala	2011-09-14 19:46:32 +0000
@@ -84,9 +84,9 @@
 
             if (iter.n_children () > 4)
             {
+                running = iter.next_value ().get_boolean ();
+                timestamp = iter.next_value ().get_int64 ();
                 enabled = iter.next_value ().get_boolean ();
-                timestamp = iter.next_value ().get_int64 ();
-                running = iter.next_value ().get_boolean ();
             }
         }
 
@@ -150,38 +150,43 @@
                         var name = parameters.get_child_value (0).dup_string ();
                         var old_owner = parameters.get_child_value (1).dup_string ();
                         var new_owner = parameters.get_child_value (2).dup_string ();
+                        if (new_owner != "") return;
 
-                        var uids = new GenericArray<string>();
-                        foreach (var uid in running.get_keys())
+                        // are there DataSources with this BusName?
+                        var disconnected_ds = new GenericArray<DataSource> ();
+                        var iter = HashTableIter<string, GenericArray<BusName?>> (running);
+                        unowned string uid;
+                        unowned GenericArray<BusName> name_arr;
+                        while (iter.next (out uid, out name_arr))
                         {
-                            var temp_uids = running.lookup(uid);
-                            for (int i = 0; i < temp_uids.length; i++)
+                            for (int i = 0; i < name_arr.length; i++)
                             {
-                                var temp_name = temp_uids[i];
-                                if (temp_name == name)
+                                if (name_arr[i] == name)
                                 {
-                                    uids.add(uid);
+                                    disconnected_ds.add (sources.lookup (uid));
+                                    name_arr.remove_index_fast (i--);
                                 }
                             }
                         }
-                        if (uids.length == 0)
-                            return;
-                        var uid = uids[0];
-                        var data_source = sources.lookup(uid);
-                        data_source.timestamp = Timestamp.now();
-                        var strid = uid +"("+ data_source.name +")";
-                        debug("Client disconnected: %s", strid);
-                        
-                        if (running.lookup(uid).length == 1)
-                        {
-                            debug("No remaining client running: %s", strid);
-                            running.remove(uid);
-                            data_source.running = false;
-                            data_source_disconnected (data_source.to_variant());
-                        }
-                        else
-                        {
-                            running.lookup(uid).remove((BusName)name);
+
+                        if (disconnected_ds.length == 0) return;
+
+                        for (int i = 0; i < disconnected_ds.length; i++)
+                        {
+                            var ds = disconnected_ds[i];
+                            uid = ds.unique_id;
+                            ds.timestamp = Timestamp.now ();
+                            var strid = "%s [%s]".printf (ds.name, uid);
+                            debug ("Client disconnected: %s", strid);
+
+                            if (running.lookup (uid).length == 0)
+                            {
+                                debug ("No remaining client running: %s", strid);
+                                running.remove (uid);
+                                ds.running = false;
+
+                                data_source_disconnected (ds.to_variant ());
+                            }
                         }
                     });
             }
@@ -249,15 +254,15 @@
         {
             debug ("%s: %s, %s, %s", Log.METHOD, unique_id, name, description);
 
-            var sender_array = running.lookup(unique_id);
+            var sender_array = running.lookup (unique_id);
             if (sender_array == null)
             {
-                running.insert(unique_id, new GenericArray<BusName?>());
-                running.lookup(unique_id).add(sender);
+                running.insert (unique_id, new GenericArray<BusName?>());
+                running.lookup (unique_id).add (sender);
             }
-            else if (is_sender_known(sender, sender_array))
+            else if (is_sender_known (sender, sender_array))
             {
-                running.lookup(unique_id).add(sender);
+                running.lookup (unique_id).add (sender);
             }
 
             unowned DataSource? ds = sources.lookup (unique_id);
@@ -269,8 +274,10 @@
                 ds.event_templates = templates;
                 ds.timestamp = Timestamp.now ();
                 ds.running = true;
-                // FIXME: Wrtie to disk here
+                // FIXME: Write to disk here
+                
                 data_source_registered (ds.to_variant ());
+
                 return ds.enabled;
             }
             else
@@ -282,8 +289,10 @@
                 new_ds.running = true;
                 new_ds.timestamp = Timestamp.now ();
                 sources.insert (unique_id, new_ds);
-                // FIXME: Wrtie to disk here
+                // FIXME: Write to disk here
+                
                 data_source_registered (new_ds.to_variant ());
+                
                 return new_ds.enabled;
             }
 
@@ -318,7 +327,7 @@
                 "Datasource with unique ID: %s not found".printf (unique_id));
         }
 
-        public override void pre_insert_events(GenericArray<Event?> events,
+        public override void pre_insert_events (GenericArray<Event?> events,
             BusName? sender)
         {
             foreach (string unique_id in running.get_keys())
@@ -340,7 +349,7 @@
             }
         }
 
-        private bool write_to_disk()
+        private bool write_to_disk ()
         {
             //FIXME: Write to disk needs to be implemented
             return true;

=== modified file 'src/utils.vala'
--- src/utils.vala	2011-09-05 10:27:02 +0000
+++ src/utils.vala	2011-09-14 19:46:32 +0000
@@ -30,7 +30,6 @@
         private static string DATABASE_FILE_PATH;
         private static string DATABASE_FILE_BACKUP_PATH;
         private static string LOCAL_EXTENSIONS_PATH;
-        //private static string DEFAULT_LOG_PATH; FIXME: remove?
 
         public const string ZEITGEIST_DATA_FOLDER = "bluebird";
         public const string USER_EXTENSION_PATH = "";
@@ -99,16 +98,8 @@
             LOCAL_EXTENSIONS_PATH = Path.build_filename (get_data_path (),
                 "extensions");
 
-            /*
-            if (!FileUtils.test (LOCAL_EXTENSIONS_PATH, FileTest.IS_DIR))
-            {
-                // FIXME: Why? There's no need to create it. --RainCT
-                DirUtils.create (LOCAL_EXTENSIONS_PATH, 0755);
-            }
-            */
-
             debug ("LOCAL_EXTENSIONS_PATH = %s", LOCAL_EXTENSIONS_PATH);
-            
+
             return LOCAL_EXTENSIONS_PATH;
         }
     }

_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to     : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp

Reply via email to