[Zeitgeist] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 274: datamodel: style fixes
revno: 274
committer: Siegfried-Angel Gevatter Pujals siegfr...@gevatter.com
branch nick: bluebird
timestamp: Sun 2011-09-25 14:13:01 +0200
message:
datamodel: style fixes
modified:
src/datamodel.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 'src/datamodel.vala'
--- src/datamodel.vala 2011-09-18 12:07:35 +
+++ src/datamodel.vala 2011-09-25 12:13:01 +
@@ -311,36 +311,36 @@
}
public Event.from_variant (Variant event_variant) {
-assert (event_variant.get_type_string () == ( +
+assert (event_variant.get_type_string () == ( +
Utils.SIG_EVENT + ));
-VariantIter iter = event_variant.iterator();
+VariantIter iter = event_variant.iterator ();
-assert (iter.n_children() == 3);
-VariantIter event_array = iter.next_value().iterator();
-VariantIter subjects_array = iter.next_value().iterator();
+assert (iter.n_children () == 3);
+VariantIter event_array = iter.next_value ().iterator ();
+VariantIter subjects_array = iter.next_value ().iterator ();
Variant payload_variant = iter.next_value ();
var event_props = event_array.n_children ();
assert (event_props = 5);
-id = (uint32) uint64.parse (event_array.next_value().get_string ());
-var str_timestamp = event_array.next_value().get_string ();
+id = (uint32) uint64.parse (event_array.next_value ().get_string ());
+var str_timestamp = event_array.next_value ().get_string ();
if (str_timestamp == )
timestamp = Timestamp.now ();
else
timestamp = int64.parse (str_timestamp);
-interpretation = event_array.next_value().get_string ();
-manifestation = event_array.next_value().get_string ();
-actor = event_array.next_value().get_string ();
+interpretation = event_array.next_value ().get_string ();
+manifestation = event_array.next_value ().get_string ();
+actor = event_array.next_value ().get_string ();
// let's keep this compatible with older clients
if (event_props = 6)
-origin = event_array.next_value().get_string ();
+origin = event_array.next_value ().get_string ();
else
origin = ;
-for (int i = 0; i subjects_array.n_children(); ++i) {
-Variant subject_variant = subjects_array.next_value();
-subjects.add(new Subject.from_variant(subject_variant));
+for (int i = 0; i subjects_array.n_children (); ++i) {
+Variant subject_variant = subjects_array.next_value ();
+subjects.add (new Subject.from_variant (subject_variant));
}
// Parse payload...
___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~zeitgeist/zeitgeist/bb-extensions-conf into lp:~zeitgeist/zeitgeist/bluebird
Siegfried Gevatter has proposed merging
lp:~zeitgeist/zeitgeist/bb-extensions-conf into
lp:~zeitgeist/zeitgeist/bluebird.
Requested reviews:
Zeitgeist Framework Team (zeitgeist)
For more details, see:
https://code.launchpad.net/~zeitgeist/zeitgeist/bb-extensions-conf/+merge/76902
--
https://code.launchpad.net/~zeitgeist/zeitgeist/bb-extensions-conf/+merge/76902
Your team Zeitgeist Framework Team is requested to review the proposed merge of
lp:~zeitgeist/zeitgeist/bb-extensions-conf into
lp:~zeitgeist/zeitgeist/bluebird.
=== modified file 'extensions/blacklist.vala'
--- extensions/blacklist.vala 2011-09-24 16:04:43 +
+++ extensions/blacklist.vala 2011-09-25 14:01:24 +
@@ -42,6 +42,47 @@
[DBus (signature = s(asassay))] Variant event_template);
}
+namespace BlacklistTemplates
+{
+private const string SIG_BLACKLIST = a{s(+Utils.SIG_EVENT+)};
+
+private static HashTablestring, Event from_variant (
+Variant templates_variant)
+{
+var blacklist = new HashTablestring, Event (str_hash, str_equal);
+
+assert (templates_variant.get_type_string () == SIG_BLACKLIST);
+foreach (Variant template_variant in templates_variant)
+{
+VariantIter iter = template_variant.iterator ();
+string template_id = iter.next_value ().get_string ();
+// FIXME: throw exception upon error instead of aborting
+Event template = new Event.from_variant (iter.next_value ());
+blacklist.insert (template_id, template);
+}
+
+return blacklist;
+}
+
+public static Variant to_variant (HashTablestring, Event blacklist)
+{
+var vb = new VariantBuilder (new VariantType (SIG_BLACKLIST));
+{
+var iter = HashTableIterstring, Event (blacklist);
+string template_id;
+Event event_template;
+while (iter.next (out template_id, out event_template))
+{
+vb.open (new VariantType ({s(+Utils.SIG_EVENT+)}));
+vb.add (s, template_id);
+vb.add_value (event_template.to_variant ());
+vb.close ();
+}
+}
+return vb.end ();
+}
+}
+
class Blacklist: Extension, RemoteBlacklist
{
private HashTablestring, Event blacklist;
@@ -54,9 +95,13 @@
construct
{
-blacklist = new HashTablestring, Event (str_hash, str_equal);
-
-// FIXME: load blacklist from file
+// Restore previous blacklist from database, or create an empty one
+Variant? templates = retrieve_config (blacklist,
+BlacklistTemplates.SIG_BLACKLIST);
+if (templates != null)
+blacklist = BlacklistTemplates.from_variant (templates);
+else
+blacklist = new HashTablestring, Event (str_hash, str_equal);
// This will be called after bus is acquired, so it shouldn't block
try
@@ -71,6 +116,10 @@
}
}
+public override string get_name () {
+return blacklist;
+}
+
public override void unload ()
{
try
@@ -92,7 +141,8 @@
private void flush ()
{
-// FIXME: write to file.
+Variant v = BlacklistTemplates.to_variant (blacklist);
+store_config (blacklist, v);
}
public override void pre_insert_events (GenericArrayEvent? events,
@@ -130,20 +180,7 @@
public Variant get_templates ()
{
-var vb = new VariantBuilder (new VariantType (a{s(+Utils.SIG_EVENT+)}));
-{
-var iter = HashTableIterstring, Event (blacklist);
-string template_id;
-Event event_template;
-while (iter.next (out template_id, out event_template))
-{
-vb.open (new VariantType ({s(+Utils.SIG_EVENT+)}));
-vb.add (s, template_id);
-vb.add_value (event_template.to_variant ());
-vb.close ();
-}
-}
-return vb.end ();
+return BlacklistTemplates.to_variant (blacklist);
}
}
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala 2011-09-16 09:15:06 +
+++ extensions/ds-registry.vala 2011-09-25 14:01:24 +
@@ -140,7 +140,7 @@
var connection = Bus.get_sync (BusType.SESSION, null);
registration_id = connection.register_objectRemoteRegistry (
/org/gnome/zeitgeist/data_source_registry, this);
-
+
connection.signal_subscribe (org.freedesktop.DBus,
org.freedesktop.DBus,
Re: [Zeitgeist] [Merge] lp:~zeitgeist/zeitgeist/bb-extensions-conf into lp:~zeitgeist/zeitgeist/bluebird
Review: Approve 1) I'd get rid of the get_name method, we can just use get_type().name() 2) if the extension needed something special, store/retrieve could be virtual Other than that it looks fine, feel free to merge! -- https://code.launchpad.net/~zeitgeist/zeitgeist/bb-extensions-conf/+merge/76902 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/zeitgeist/bluebird. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 276: - Remove Extension.get_name method, use get_type().name() instead.
revno: 276
committer: Siegfried-Angel Gevatter Pujals siegfr...@gevatter.com
branch nick: bluebird
timestamp: Sun 2011-09-25 17:58:52 +0200
message:
- Remove Extension.get_name method, use get_type().name() instead.
- Document the store_config and retrieve_config functions.
modified:
extensions/blacklist.vala
extensions/ds-registry.vala
extensions/histogram.vala
src/extension.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/blacklist.vala'
--- extensions/blacklist.vala 2011-09-25 13:45:59 +
+++ extensions/blacklist.vala 2011-09-25 15:58:52 +
@@ -116,10 +116,6 @@
}
}
-public override string get_name () {
-return blacklist;
-}
-
public override void unload ()
{
try
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala 2011-09-25 13:45:59 +
+++ extensions/ds-registry.vala 2011-09-25 15:58:52 +
@@ -200,11 +200,6 @@
}
-public override string get_name ()
-{
-return data-source-registry;
-}
-
public override void unload ()
{
try
=== modified file 'extensions/histogram.vala'
--- extensions/histogram.vala 2011-09-25 13:45:59 +
+++ extensions/histogram.vala 2011-09-25 15:58:52 +
@@ -49,11 +49,6 @@
}
}
-public override string get_name ()
-{
-return histogram;
-}
-
public override void unload ()
{
try
=== modified file 'src/extension.vala'
--- src/extension.vala 2011-09-25 13:45:59 +
+++ src/extension.vala 2011-09-25 15:58:52 +
@@ -38,8 +38,6 @@
{
public unowned Engine engine { get; construct set; }
-public abstract string get_name();
-
/**
* This method gets called before Zeitgeist stops.
*
@@ -127,15 +125,27 @@
{
}
+/**
+ * Store `data' under the given (extension unique) key, overwriting any
+ * previous value.
+ */
protected void store_config (string key, Variant data)
{
-engine.extension_store.store (get_name (), key, data);
+engine.extension_store.store (get_type ().name (), key, data);
}
+/**
+ * Retrieve data this extension previously stored under the given key,
+ * or null if there is no such data.
+ *
+ * @param key: key under which the data is stored
+ * @param format: type string for the resulting Variant
+ */
protected Variant? retrieve_config (string key, string format)
{
VariantType type = new VariantType(format);
-return engine.extension_store.retrieve (get_name (), key, type);
+return engine.extension_store.retrieve (
+get_type ().name (), key, type);
}
}
___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~zeitgeist/zeitgeist/bb-extensions-conf into lp:~zeitgeist/zeitgeist/bluebird
The proposal to merge lp:~zeitgeist/zeitgeist/bb-extensions-conf into lp:~zeitgeist/zeitgeist/bluebird has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zeitgeist/zeitgeist/bb-extensions-conf/+merge/76902 -- https://code.launchpad.net/~zeitgeist/zeitgeist/bb-extensions-conf/+merge/76902 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/zeitgeist/bluebird. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~zeitgeist/zeitgeist/bb-extensions-conf into lp:~zeitgeist/zeitgeist/bluebird
Great. Thanks for the review. 1) Changed, wasn't quite happy with get_name. 2) I'd rather not, if they really need to do something weird they can add a new function. -- https://code.launchpad.net/~zeitgeist/zeitgeist/bb-extensions-conf/+merge/76902 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/zeitgeist/bluebird. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Bug 807950] Re: zeitgeist-daemon crashed with LookupError in remove_from_connection(): _zeitgeist.engine.remote.RemoteInterface at /org/gnome/zeitgeist/log/activity at 0xb74ee2cc is not
Yes indeed, still crashes at every reboot. Has fix really been released? If not, when should it be packaged if status says fix released? -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/807950 Title: zeitgeist-daemon crashed with LookupError in remove_from_connection(): _zeitgeist.engine.remote.RemoteInterface at /org/gnome/zeitgeist/log/activity at 0xb74ee2cc is not exported at a location matching (None,None) Status in Zeitgeist Framework: Fix Released Status in “zeitgeist” package in Ubuntu: Triaged Status in “zeitgeist” source package in Oneiric: Triaged Bug description: I tried to start update of Ubuntu ProblemType: Crash DistroRelease: Ubuntu 11.10 Package: zeitgeist-core 0.8.1-1ubuntu1 ProcVersionSignature: Ubuntu 3.0-2.3-generic 3.0.0-rc4 Uname: Linux 3.0-2-generic i686 NonfreeKernelModules: nvidia Architecture: i386 Date: Sat Jul 9 15:52:11 2011 ExecutablePath: /usr/bin/zeitgeist-daemon InstallationMedia: Ubuntu 11.10 Oneiric Ocelot - Alpha i386 (20110704.1) InterpreterPath: /usr/bin/python2.7 PackageArchitecture: all ProcCmdline: /usr/bin/python /usr/bin/zeitgeist-daemon ProcEnviron: SHELL=/bin/bash LANG=ru_RU.UTF-8 PythonArgs: ['/usr/bin/zeitgeist-daemon'] SourcePackage: zeitgeist Title: zeitgeist-daemon crashed with LookupError in remove_from_connection(): _zeitgeist.engine.remote.RemoteInterface at /org/gnome/zeitgeist/log/activity at 0xb74ee2cc is not exported at a location matching (None,None) UpgradeStatus: No upgrade log present (probably fresh install) UserGroups: adm admin cdrom dialout lpadmin plugdev sambashare To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/807950/+subscriptions ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
