Ticket #6729: 0001-bug-6729-hash-and-check-for-dupes-before-saving-do.patch

readactivity.py

@@ -15 +15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+from __future__ import with_statement
 import logging
 import os
 import tempfile
@@ -244 +245 @@
 
         self.metadata['Read_search'] = self._edit_toolbar._search_entry.props.text
 
+    def _revalidate_jobject(self, jobject):
+        return datastore.get(jobject.object_id)
+        
     def _ensure_in_datastore(self, tempfile):
-        import hashlib,json
+        import hashlib
         filehash = hashlib.md5()
         
-        with f=ChunkyFile(tempfile):
+        with ChunkyFile(tempfile) as f:
             for chunk in f.read_chunks():
                 filehash.update(chunk)
-        digest = filehash.hexdigest()
+        hash = filehash.hexdigest()
+        _logger.debug("Got file with hash %s...", hash)
+        
+        results, numresults = datastore.find({'hash':hash})
+        _logger.debug("%s results in datastore...", str(numresults))
         
-        results, numresults = datastore.find({'hash':digest})
         if numresults:
             _logger.debug("File %s already in datastore (id %s)...", tempfile,
-                          results[0]['uid'])
-            self._jobject = datastore.get(results[0]['uid'])
-            os.rm(tempfile)
+                          results[0].object_id)
+            self._jobject = results[0]
+            os.remove(tempfile)
             return self._jobject.file_path
             
         else:
             _logger.debug("Moving file %s to datastore...", tempfile)
             self._jobject.file_path = tempfile
-            self._jobject.metadata['hash'] = filehash.hexdigest()
+            self._jobject.metadata['hash'] = hash
             datastore.write(self._jobject, transfer_ownership=True)
-            return tempfile
+            self._jobject = self._revalidate_jobject(self._jobject)
+            _logger.debug("File path in datastore is %s", self._jobject.file_path)
+            return self._jobject.file_path
 
     def _download_result_cb(self, getter, tempfile, suggested_name, tube_id):
         del self.unused_download_tubes