Ticket #1636: 0002-Removable-disk-read-json-formatted-.metadata-and-.pr.patch

src/jarabe/journal/model.py

@@ -29 +29 @@
 import gconf
 import gio
 import json
+import base64
 
 from sugar import dispatch
 from sugar import mime
@@ -310 +311 @@
         files = self._file_list[offset:offset + limit]
 
         entries = []
-        for file_path, stat, mtime_ in files:
-            metadata = _get_file_metadata(file_path, stat)
+        for file_path, stat, mtime_, metadata in files:
+            if metadata == False:
+                # fallback - the find should fetch md
+                metadata = _get_file_metadata(file_path, stat)
             metadata['mountpoint'] = self._mount_point
             entries.append(metadata)
 
@@ -336 +339 @@
                 elif S_IFMT(stat.st_mode) == S_IFREG:
                     add_to_list = True
 
-                    if self._regex is not None and \
-                            not self._regex.match(full_path):
+                    md = _get_file_metadata_from_json(dir_path, entry,
+                                                       preview=False)
+                    if self._regex is not None:
                         add_to_list = False
+                        if self._regex.match(full_path):
+                            add_to_list = True
+                        elif md:
+                            # match any of the text md fields
+                            for f in ['fulltext', 'title', 'description', 'tags']:
+                                if f in md and self._regex.match(md[f]):
+                                    add_to_list = True
+                                    break
 
                     if None not in [self._date_start, self._date_end] and \
                             (stat.st_mtime < self._date_start or
@@ -351 +363 @@
                             add_to_list = False
 
                     if add_to_list:
-                        file_info = (full_path, stat, int(stat.st_mtime))
+                        file_info = (full_path, stat, int(stat.st_mtime), md)
                         self._file_list.append(file_info)
 
                     self.progress.send(self)
@@ -366 +378 @@
             self._pending_directories -= 1
 
 def _get_file_metadata(path, stat):
+    # will sometimes be called for
+    # files that do have a metatada file
+    fname = os.path.basename(path)
+    dir_path = os.path.dirname(path)
+    md = _get_file_metadata_from_json(dir_path, fname, preview=True)
+    if md:
+        return md
+
+    # make up something for files w/o metadata
     client = gconf.client_get_default()
     return {'uid': path,
             'title': os.path.basename(path),
@@ -376 +397 @@
             'icon-color': client.get_string('/desktop/sugar/user/color'),
             'description': path}
 
+def _get_file_metadata_from_json(dir_path, fname, preview=False):
+    md = None
+    mdpath = os.path.join(dir_path,
+                          '.'+fname+'.metadata')
+    md = False
+    if os.path.exists(mdpath):
+        try:
+            md = json.load(open(mdpath))
+            md['uid'] = os.path.join(dir_path, fname)
+        except:
+            pass
+    if preview:
+        prpath = os.path.join(dir_path,
+                              '.'+fname+'.preview')
+        try:
+            preview = base64.b64encode(open(prpath).read())
+            md['preview'] = preview
+        except:
+            pass
+    else:
+        if md and 'preview' in md:
+            del(md['preview'])
+    return md
+
 _datastore = None
 def _get_datastore():
     global _datastore