Ticket #1215: 0001-add-filesize-to-returned-metadata.patch

src/carquinyol/datastore.py

@@ -26 +26 @@
 import gobject
 
 from sugar import mime
+from sugar.logger import trace
 
 from carquinyol import layoutmanager
 from carquinyol import migration
@@ -225 +226 @@
 
                 return self._find_all(query, properties)
 
-            metadata = self._metadata_store.retrieve(uid, properties)
-            entries.append(metadata)
+            entries.append(self._get_metadata(uid, properties))
 
         logger.debug('find(): %r', time.time() - t)
 
@@ -240 +240 @@
         limit = query.get('limit', MAX_QUERY_LIMIT)
         uids = uids[offset:offset + limit]
 
-        entries = []
-        for uid in uids:
-            metadata = self._metadata_store.retrieve(uid, properties)
-            entries.append(metadata)
-
+        entries = [self._get_metadata(uid, properties) for uid in uids]
         return entries, count
 
+    def _get_metadata(self, uid, properties):
+        metadata = self._metadata_store.retrieve(uid, properties)
+        metadata['filesize'] = self._file_store.get_file_size(uid)
+        return metadata
+
     @dbus.service.method(DS_DBUS_INTERFACE,
              in_signature='s',
              out_signature='s',
@@ -266 +267 @@
     @dbus.service.method(DS_DBUS_INTERFACE,
                          in_signature='s',
                          out_signature='a{sv}')
+    @trace(logger=logger)
     def get_properties(self, uid):
-        logging.debug('datastore.get_properties %r', uid)
-        metadata = self._metadata_store.retrieve(uid)
-        return metadata
+        return self._get_metadata(uid, [])
 
     @dbus.service.method(DS_DBUS_INTERFACE,
                          in_signature='sa{sv}',

src/carquinyol/filestore.py

@@ -146 +146 @@
     def get_file_path(self, uid):
         return layoutmanager.get_instance().get_data_path(uid)
 
+    def get_file_size(self, uid):
+        file_path = layoutmanager.get_instance().get_data_path(uid)
+        if not os.path.exists(file_path):
+            return 0
+
+        return os.stat(file_path).st_size
+
     def delete(self, uid):
         """Remove the file associated to a given entry.