Ticket #1636: sugar-1636.patch

src/jarabe/journal/listview.py

@@ -123 +123 @@
                 datastore.connect_to_signal('Deleted',
                                             self.__datastore_deleted_cb)
 
+        model.created.connect(self.__model_updated_cb)
+        model.updated.connect(self.__model_updated_cb)
+        model.deleted.connect(self.__model_updated_cb)
+
+    def __model_updated_cb(self, sender, **kwargs):
+        if 'object_id' in kwargs and kwargs['object_id'].startswith('/'):
+            # otherwise rely on ds' Deleted event for ds objects
+            self._set_dirty()
+
     def __destroy_cb(self, widget):
         self._datastore_created_handler.remove()
         self._datastore_updated_handler.remove()

src/jarabe/journal/model.py

@@ -19 +19 @@
 from datetime import datetime
 import time
 import shutil
+import tempfile
 from stat import S_IFMT, S_IFDIR, S_IFREG
 import traceback
 import re
@@ -27 +28 @@
 import dbus
 import gconf
 import gio
+import json
+import base64
 
 from sugar import dispatch
 from sugar import mime
@@ -308 +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)
 
@@ -334 +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
@@ -349 +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)
@@ -364 +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),
@@ -374 +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
@@ -460 +507 @@
     """
     if os.path.exists(object_id):
         os.unlink(object_id)
+        dir_path = os.path.dirname(object_id)
+        fname = os.path.basename(object_id)
+        old_files = [ os.path.join(dir_path,
+                                   '.'+fname+'.metadata'),
+                      os.path.join(dir_path,
+                                   '.'+fname+'.preview') ]
+        for ofile in old_files:
+            if os.path.exists(ofile):
+                try:
+                    os.unlink(ofile)
+                except:
+                    pass
         deleted.send(None, object_id=object_id)
     else:
         _get_datastore().delete(object_id)
@@ -480 +539 @@
     """
     logging.debug('model.write %r %r %r' % (metadata.get('uid', ''), file_path,
                                             update_mtime))
+
+    rename = False
+
     if update_mtime:
         metadata['mtime'] = datetime.now().isoformat()
         metadata['timestamp'] = int(time.time())
@@ -495 +557 @@
                                                  file_path,
                                                  True)
     else:
-        if not os.path.exists(file_path):
+        if 'uid' in metadata and os.path.exists(metadata['uid']):
+            file_path = metadata['uid']
+
+        if not file_path or not os.path.exists(file_path):
             raise ValueError('Entries without a file cannot be copied to '
                              'removable devices')
 
@@ -503 +568 @@
         file_name = _get_unique_file_name(metadata['mountpoint'], file_name)
 
         destination_path = os.path.join(metadata['mountpoint'], file_name)
-        shutil.copy(file_path, destination_path)
+
+        if os.path.dirname(destination_path) == os.path.dirname(file_path):
+            ## FIXME: handle renames in a separate codepath
+            ##        in a failsafe manner
+            ##        (write new md, then rename and rm old)
+            # rename on a removable disk - mv file, but let
+            # the metadata&preview be written - at least md will
+            # be different
+            rename = True
+            old_file_path = file_path
+
+            os.rename(file_path, destination_path)
+            old_fname = os.path.basename(file_path)
+            old_files = [ os.path.join(metadata['mountpoint'],
+                                       '.'+old_fname+'.metadata'),
+                          os.path.join(metadata['mountpoint'],
+                                       '.'+old_fname+'.preview') ]
+            for ofile in old_files:
+                if os.path.exists(ofile):
+                    try:
+                        os.unlink(ofile)
+                    except:
+                        pass
+
+        else:
+            shutil.copy(file_path, destination_path)
+
+        # issue our metadata massage on a copy
+        md = metadata.copy()
+        del md['mountpoint']
+
+        # if we ever write to places other than the root
+        # keep in mind that the metadata file must be in the
+        # same directory as the data file.
+        md_path = os.path.join(metadata['mountpoint'],
+                               '.'+file_name+'.metadata')
+
+        if 'preview' in md:
+            preview = md['preview']
+            preview_fname =  '.'+file_name+'.preview'
+            preview_path = os.path.join(metadata['mountpoint'], preview_fname)
+            md['preview'] = preview_fname
+
+            # Write preview atomically
+            (fh, fn) = tempfile.mkstemp(dir=metadata['mountpoint'])
+            os.write(fh, preview)
+            os.close(fh)
+            os.rename(fn, preview_path)
+
+        # Write metadata atomically (on FSs that support it)
+        (fh, fn) = tempfile.mkstemp(dir=metadata['mountpoint'])
+        os.write(fh, json.dumps(md))
+        os.close(fh)
+        os.rename(fn, md_path)
+
         object_id = destination_path
+        metadata['uid'] = object_id
         created.send(None, object_id=object_id)
 
     return object_id
@@ -512 +632 @@
 def _get_file_name(title, mime_type):
     file_name = title
 
-    extension = '.' + mime.get_primary_extension(mime_type)
-    if not file_name.endswith(extension):
-        file_name += extension
+    mime_extension = mime.get_primary_extension(mime_type)
+    if mime_extension:
+        extension = '.' + mime_extension
+        if not file_name.endswith(extension):
+            file_name += extension
 
     # Invalid characters in VFAT filenames. From
     # http://en.wikipedia.org/wiki/File_Allocation_Table