Merge lp:~angeloc/unity-lens-files/fix-for-837810 into lp:unity-lens-files

[Angelo Compagnucci]

Added desktop to favourites in files and folders lens.

[Michal Hruby (mhr3)]

Thanks for this! A couple of comments:

8 + string uri_desktop = "file://" + @"$(Environment.get_user_special_dir(UserDirectory.DESKTOP))";

Don't do this pls, use Gio's File.new_for_path and the get_uri () method in the File interface.

17 + var desktop_display_name = Uri.unescape_string (uri_desktop);
18 + desktop_display_name = Filename.display_basename (desktop_display_name);

Eeek, again, we have File.get_parse_name()

I also think that the desktop bookmark (which isn't a bookmark) should be last in the list, so it doesn't stick out.

review: Needs Fixing

[Angelo Compagnucci (angeloc)]

Done!

modified:
    src/folder.vala
    - Using File.new_for_path instead path string concatenation
    - Moved desktop folder to the end of favourites list

[lp:~angeloc/unity-lens-files/fix-for-837810]

223. By Angelo Compagnucci on 2012-03-16

modified:
  src/folder.vala
  - Using File.new_for_path instead path string concatenation
  - Moved desktop folder to the end of favourites list

224. By Angelo Compagnucci on 2012-03-16

modified:
  src/folder.vala
  - Using get_parse_name() to get desktop folder name.

[Angelo Compagnucci (angeloc)]

Done

modified:
  src/folder.vala
  - Using get_parse_name() to get desktop folder name.

[Michal Hruby (mhr3)]

10 + File uri_desktop_file = File.new_for_path (@"$(Environment.get_user_special_dir(UserDirectory.DESKTOP))");

Can you please remove the string template, it's useless in this case.

36 + var desktop_display_name = Filename.display_basename (uri_desktop_file.get_parse_name());

This should be just Path.get_basename, not Filename.display_basename (Filename.display_basename doesn't expect utf-8 string).

25 + if (uri == uri_desktop)
26 + continue;

If the user has Desktop in favourites, we shouldn't mess with the order, and this should be just a flag "if (uri == uri_desktop) add_desktop_bookmark = false;".

review: Needs Fixing

[Michal Hruby (mhr3)]

Fixed the remaining issues and proposed in https://code.launchpad.net/~mhr3/unity-lens-files/fix-837810/+merge/100986 Thanks!

Unmerged revisions

=== modified file 'src/folder.vala'
--- src/folder.vala	2012-03-05 09:36:13 +0000
+++ src/folder.vala	2012-03-16 18:15:22 +0000
@@ -52,6 +52,10 @@
     {
       bookmarks = new List<Bookmark> ();
       string contents;
+      string uri_desktop;
+      
+      File uri_desktop_file = File.new_for_path (@"$(Environment.get_user_special_dir(UserDirectory.DESKTOP))");
+      uri_desktop = uri_desktop_file.get_uri ();
       
       try {
         FileUtils.get_contents (bookmarks_file, out contents);
@@ -64,11 +68,13 @@
       string[] favorites = contents.split ("\n");
       string mimetype = "inode/directory";
       
-      
       foreach (var uri in favorites)
       {
         if (uri == "")
           continue;
+          
+        if (uri == uri_desktop)
+		  continue;
               
         string[] parts = uri.split (" ", 2);
         string display_name;
@@ -93,6 +99,11 @@
         var bookmark = new Bookmark (uri, mimetype, display_name);
         bookmarks.append (bookmark);
       }
+      
+      /* Add desktop statically */
+      var desktop_display_name = Filename.display_basename (uri_desktop_file.get_parse_name());
+      var desktop_bookmark = new Bookmark (uri_desktop, mimetype, desktop_display_name);
+      bookmarks.append (desktop_bookmark);
     }
 
     /* makes sure the uris exist on the filesystem (checks only native uris) */