Merge lp:~mhr3/unity-lens-files/bug-839807 into lp:unity-lens-files

[Michal Hruby]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Works well, and code looks nice and tidy. Good work!

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-09-20 14:44:54 +0000
+++ src/daemon.vala	2011-09-21 09:19:22 +0000
@@ -372,7 +372,11 @@
         var bookmark_matches = bookmarks.prefix_search (search.search_string);
         append_bookmarks (bookmark_matches, results_model, Categories.FOLDERS);
         
-        Unity.FilesLens.append_events_sorted (results, results_model);
+        int64 min_size, max_size;
+        get_current_size_limits (out min_size, out max_size);
+
+        Unity.FilesLens.append_events_sorted (results, results_model,
+                                              min_size, max_size);
 
       } catch (GLib.Error e) {
         warning ("Error performing global search '%s': %s",
@@ -447,9 +451,13 @@
         var bookmark_matches = bookmarks.prefix_search (search.search_string);
         append_bookmarks (bookmark_matches, results_model, Categories.FOLDERS);
 
+        int64 min_size, max_size;
+        get_current_size_limits (out min_size, out max_size);
+
         /* FIXME: Add downloads */
         
-        Unity.FilesLens.append_events_sorted (results, results_model);
+        Unity.FilesLens.append_events_sorted (results, results_model,
+                                              min_size, max_size);
 
       } catch (GLib.Error e) {
         warning ("Error performing global search '%s': %s",
@@ -493,6 +501,76 @@
         return new TimeRange.anytime ();
     }
 
+    private void get_current_size_limits (out int64 min_size, out int64 max_size)
+    {
+      var filter = scope.get_filter ("size") as MultiRangeFilter;
+      Unity.FilterOption? min_opt = filter.get_first_active ();
+      Unity.FilterOption? max_opt = filter.get_last_active ();
+
+      if (min_opt == null || max_opt == null)
+      {
+        min_size = 0;
+        max_size = int64.MAX;
+        return;
+      }
+
+      int64[] sizes = 
+      {
+        0,
+        1024,
+        102400,
+        1048576,
+        10485760,
+        104857600,
+        1073741824,
+        int64.MAX
+      };
+
+      switch (min_opt.id)
+      {
+        case "1KB":
+          min_size = sizes[0]; break;
+        case "100KB":
+          min_size = sizes[1]; break;
+        case "1MB":
+          min_size = sizes[2]; break;
+        case "10MB":
+          min_size = sizes[3]; break;
+        case "100MB":
+          min_size = sizes[4]; break;
+        case "1GB":
+          min_size = sizes[5]; break;
+        case ">1GB":
+          min_size = sizes[6]; break;
+        default:
+          warn_if_reached ();
+          min_size = 0;
+          break;
+      }
+
+      switch (max_opt.id)
+      {
+        case "1KB":
+          max_size = sizes[1]; break;
+        case "100KB":
+          max_size = sizes[2]; break;
+        case "1MB":
+          max_size = sizes[3]; break;
+        case "10MB":
+          max_size = sizes[4]; break;
+        case "100MB":
+          max_size = sizes[5]; break;
+        case "1GB":
+          max_size = sizes[6]; break;
+        case ">1GB":
+          max_size = sizes[7]; break;
+        default:
+          warn_if_reached ();
+          max_size = int64.MAX;
+          break;
+      }
+    }
+
     private async void update_without_search_async (LensSearch search)
     {
       var results_model = scope.results_model;
@@ -531,9 +609,13 @@
         if (type_id == "all" || type_id == "folder")
           append_bookmarks (bookmarks.list(), results_model);
 
+        int64 min_size, max_size;
+        get_current_size_limits (out min_size, out max_size);
+
         yield update_downloads_async (results_model);
-       
-        Unity.FilesLens.append_events_sorted (results, results_model);
+
+        Unity.FilesLens.append_events_sorted (results, results_model,
+                                              min_size, max_size);
 
       } catch (GLib.Error e) {
         warning ("Error performing empty search: %s",
@@ -585,6 +667,8 @@
       downloads.sort ((CompareFunc) Utils.cmp_file_info_by_mtime);
       
       var timerange = get_current_timerange ();
+      int64 min_size, max_size;
+      get_current_size_limits (out min_size, out max_size);
       
       foreach (var info in downloads)
       {
@@ -603,6 +687,11 @@
         if (type_id != "all" && !Utils.file_info_matches_type (info, type_id))
           continue;
         
+        // check if size is within bounds
+        int64 size = info.get_size ();
+        if (size < min_size || size > max_size)
+          continue;
+
         results_model.append (uri, icon_hint, Categories.DOWNLOADS,
                               mimetype, info.get_display_name (), uri);
       }
@@ -630,10 +719,15 @@
     
   }  
 
+  private const string ATTR_HIDDEN = FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+  private const string ATTR_SIZE_AND_HIDDEN = FILE_ATTRIBUTE_STANDARD_SIZE +
+    "," + FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+
   /* Appends a set of Zeitgeist.Events to our Dee.Model assuming that
    * these events are already sorted with descending timestamps */
   public void append_events_sorted (Zeitgeist.ResultSet events,
-                                    Dee.Model results)
+                                    Dee.Model results,
+                                    int64 min_size, int64 max_size)
   {
      foreach (var ev in events)
       {
@@ -648,14 +742,21 @@
                           su.get_mimetype () : "application/octet-stream";
             File file = File.new_for_uri (uri);
             
+            bool check_size = min_size > 0 || max_size < int64.MAX;
             /* Don't check existence on non-native files as http:// and
              * friends are *very* expensive to query */
             if (file.is_native()) {
               // hidden files should be ignored
               try {
-                FileInfo info = file.query_info(FILE_ATTRIBUTE_STANDARD_IS_HIDDEN, 0, null);
+                FileInfo info = file.query_info (check_size ?
+                  ATTR_SIZE_AND_HIDDEN : ATTR_HIDDEN, 0, null);
                 if (info.get_is_hidden())
                   continue;
+                if (check_size &&
+                  (info.get_size () < min_size || info.get_size () > max_size))
+                {
+                  continue;
+                }
               } catch (GLib.Error e) {
                 // as error occurred file must be missing therefore ignoring it
                 continue;
@@ -689,7 +790,7 @@
             results.append (uri, icon, category_id, mimetype,
                             display_name, comment);
             
-          }          
+          }
       }
    }
 } /* namespace */

=== modified file 'src/utils.vala'
--- src/utils.vala	2011-09-20 14:44:54 +0000
+++ src/utils.vala	2011-09-21 09:19:22 +0000
@@ -33,6 +33,7 @@
                                 FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE + "," +
                                 FILE_ATTRIBUTE_STANDARD_IS_HIDDEN + "," +
                                 FILE_ATTRIBUTE_STANDARD_IS_BACKUP + "," +
+                                FILE_ATTRIBUTE_STANDARD_SIZE + "," +
                                 FILE_ATTRIBUTE_TIME_MODIFIED + "," +
                                 FILE_ATTRIBUTE_TIME_ACCESS;