Merge pull request #148 from opengisch/changelog

Make changelog only for current release

qfieldsync/metadata.txt

@@ -19,36 +19,13 @@ [email protected]
 # Recommended items:
 
 changelog=
-    Release 1.0.0
+    Release 3.1.8
     -------------
-    * Fix synchronisation and add translations
-
-    Release 0.9.3
-    --------------
-    * Allow taking offline copies of spatialite databases
-
-    Release 0.9.2
-    --------------
-    * Properly reload original project after packaging
-
-    Release 0.9.1
-    --------------
-    * Fix the basemap functionality on Windows
-
-    Release 0.8.19
-    --------------
-    * Configurable temporary directory
-
-    Release 0.8.17
-    --------------
-    * Allow using raster layers as basemap
-
-    Initial release
-    ---------------
-    * Allow syncing from QField to QGIS
-    * Use qgis2compat plugin
-    * Show syncing errors
-    * Allow syncing from QGIS to QField
+    * Configurable attachement path with expressions
+    * Synchronize files of DCIM folder
+    * Fix adding project folder
+
+    Check out the complete changelog on: https://github.com/opengisch/qfieldsync/releases
 
 # Tags are comma separated with spaces allowed
 tags=QField, Android, Synchronization, Offline, qfieldsync
@@ -67,3 +44,4 @@ deprecated=False
 about=
     This plugin facilitates packaging QGIS projects for QField.<br>
     It analyses the current project and suggests (and performs) actions needed to make the project working on QField.
+

qfieldsync/tests/test_export.py

@@ -61,18 +61,20 @@ def test_copy(self):
         self.assertIn('spatialite.db', files)
 
         dcim_folder = os.path.join(export_folder, "DCIM")
-        self.assertIn('qfield_photo_1.jpg', dcim_folder)
-        self.assertIn('qfield_photo_2.jpg', dcim_folder)
-        self.assertIn('qfield_photo_3.jpg', dcim_folder)
+        dcim_files = os.listdir(dcim_folder)
+        self.assertIn('qfield-photo_1.jpg', dcim_files)
+        self.assertIn('qfield-photo_2.jpg', dcim_files)
+        self.assertIn('qfield-photo_3.jpg', dcim_files)
         dcim_subfolder = os.path.join(dcim_folder, "subfolder")
-        self.assertIn('qfield_photo_sub_1.jpg', dcim_subfolder)
-        self.assertIn('qfield_photo_sub_2.jpg', dcim_subfolder)
-        self.assertIn('qfield_photo_sub_3.jpg', dcim_subfolder)
+        dcim_subfiles = os.listdir(dcim_subfolder)
+        self.assertIn('qfield-photo_sub_1.jpg', dcim_subfiles)
+        self.assertIn('qfield-photo_sub_2.jpg', dcim_subfiles)
+        self.assertIn('qfield-photo_sub_3.jpg', dcim_subfiles)
 
         shutil.rmtree(export_folder)
         shutil.rmtree(source_folder)
 
     def load_project(self, path):
         project = QgsProject.instance()
         self.assertTrue(project.read(path))
-        return project
+        return project