Merge lp:~rainct/zeitgeist/find_storage_for_uri into lp:~zeitgeist/zeitgeist/bluebird

[Siegfried Gevatter]

[Michal Hruby (mhr3)]

38 + string uri_scheme = uri.substring (0, uri.index_of ("://"));

There's File.get_uri_scheme() for that.

45 + Mount mount = file.find_enclosing_mount ();

I'm really worried here, it's bringing back gvfs and I dont like that one bit, can be disable it for now and just distinguish net vs unknown?

review: Needs Fixing

[lp:~rainct/zeitgeist/find_storage_for_uri]

376. By Siegfried Gevatter on 2012-01-27

Remove the usage of gvfs (find_enclosing_mount) for now.

[Michal Hruby (mhr3)]

54 + else*/ if (uri_scheme in network_uri_schemes)

Would be nice to add a linebreak there, but otherwise fine...

review: Approve

=== modified file 'extensions/storage-monitor.vala'
--- extensions/storage-monitor.vala	2012-01-06 10:20:42 +0000
+++ extensions/storage-monitor.vala	2012-01-27 13:18:25 +0000
@@ -3,6 +3,8 @@
  * Copyright © 2011 Collabora Ltd.
  *             By Siegfried-Angel Gevatter Pujals <[e-mail]>
  * Copyright © 2011 Stefano Candori <[e-mail]>
+ * Copyright © 2012 Canonical Ltd.
+ *             By Siegfried-A. Gevatter <[e-mail]>
  *
  * Based upon a Python implementation:
  *  Copyright © 2009 Mikkel Kamstrup Erlandsen <[e-mail]>
@@ -91,7 +93,7 @@
      *    they reside in;
      *  - otherwise, the fixed identifier `unknown`.
      *
-     * Subjects with storage `local` or `unwknown` are always considered as
+     * Subjects with storage `local` or `unknown` are always considered as
      * available; for network resources, the monitor will use either ConnMan
      * or NetworkManager (whichever is available).
      *
@@ -100,6 +102,10 @@
      */
     class StorageMonitor: Extension, RemoteStorageMonitor
     {
+        private const string[] network_uri_schemes = {
+            "dav", "davs", "ftp", "http", "https", "mailto",
+            "sftp", "smb", "ssh" };
+
         private Zeitgeist.SQLite.ZeitgeistDatabase database;
         private unowned Sqlite.Database db;
         private uint registration_id;
@@ -277,7 +283,27 @@
          */
         private string find_storage_for_uri (string uri)
         {
-            // FIXME
+            File file = File.new_for_uri (uri);
+            string uri_scheme = file.get_uri_scheme ();
+            /*
+            // FIXME: uncomment this once gvfs is our friend again
+            if (uri_scheme == "file")
+            {
+                try
+                {
+                    Mount mount = file.find_enclosing_mount ();
+                    return get_volume_id (mount.get_volume ());
+                }
+                catch (Error err)
+                {
+                    return "local";
+                }
+            }
+            else*/ if (uri_scheme in network_uri_schemes)
+            {
+                return "net";
+            }
+
             return "unknown";
         }