Merge pull request #121 from opengisch/fix_file_not_found

Only calculate md5sum if offline editing done

qfieldsync/dialogs/synchronize_dialog.py

@@ -65,7 +65,7 @@ def start_synchronization(self):
             current_import_file_checksum = import_file_checksum(qfield_folder)
             imported_files_checksums = import_checksums_of_project(qfield_folder)
 
-            if imported_files_checksums and current_import_file_checksum in imported_files_checksums:
+            if imported_files_checksums and current_import_file_checksum and current_import_file_checksum in imported_files_checksums:
                 message = self.tr("Data from this file are already synchronized with the original project.")
                 raise NoProjectFoundError(message)
             qgs_file = get_project_in_folder(qfield_folder)
@@ -84,7 +84,6 @@ def start_synchronization(self):
                         ProjectConfiguration(QgsProject.instance()).imported_files_checksums = imported_files_checksums
                         QgsProject.instance().write()
                         self.iface.messageBar().pushInfo('QFieldSync', self.tr(u"Opened original project {}".format(original_project_path)))
-                        print(imported_files_checksums)
                     else:
                         self.iface.messageBar().pushInfo('QFieldSync', self.tr(u"The data has been synchronized successfully but the original project ({}) could not be opened. ".format(original_project_path)))
                 self.close()

qfieldsync/utils/file_utils.py

@@ -83,9 +83,13 @@ def open_folder(path):
 
 
 def import_file_checksum(folder):
+    md5sum = None
     path = os.path.join(folder, "data.gpkg")
     if not os.path.exists(path):
         path = os.path.join(folder, "data.sqlite")
-    with open(path, 'rb') as f:
-        file_data = f.read()
-    return hashlib.md5(file_data).hexdigest()
+    if os.path.exists(path):
+        with open(path, 'rb') as f:
+            file_data = f.read()
+            md5sum = hashlib.md5(file_data).hexdigest()
+
+    return md5sum