Feil med fil-arkivering #38

langrenn-sprint · Dec 3, 2024 · 5be4ffd · 5be4ffd
1 parent faf78ae
commit 5be4ffd
Show file tree

Hide file tree

Showing 4 changed files with 779 additions and 728 deletions.
diff --git a/photo_service_gui/services/events_adapter.py b/photo_service_gui/services/events_adapter.py
@@ -148,6 +148,12 @@ async def sync_events(self, token: str, remote_url: str) -> str:
         """Import events from remote server and store in local db."""
         servicename = "sync_events"
         information = "Importerer events."
+        current_events = await self.get_all_events(token)
+        current_event_ids = []
+        for event in current_events:
+            current_event_ids.append(event["id"])
+
+
         headers = MultiDict(
             [
                 (hdrs.AUTHORIZATION, f"Bearer {token}"),
@@ -162,9 +168,10 @@ async def sync_events(self, token: str, remote_url: str) -> str:
                     # import events to local database
                     if events:
                         for event in events:
-                            information += await EventsAdapter().create_event(
-                                token, event
-                            )
+                            if event["id"] not in current_event_ids:
+                                information += await EventsAdapter().create_event(
+                                    token, event
+                                )
                 elif resp.status == 401:
                     raise web.HTTPBadRequest(reason=f"401 Unathorized - {servicename}")
                 else:

diff --git a/photo_service_gui/services/foto_service.py b/photo_service_gui/services/foto_service.py
@@ -251,13 +251,17 @@ async def push_new_photos_from_file(self, token: str, event: dict) -> str:
                     logging.error(error_text)
                     raise Exception(error_text) from e
 
-                # archive photos
-                PhotosFileAdapter().move_photo_to_archive(
-                    os.path.basename(group["main"])
-                )
-                PhotosFileAdapter().move_photo_to_archive(
-                    os.path.basename(group["crop"])
-                )
+                # archive photos - ignore errors
+                try:
+                    PhotosFileAdapter().move_photo_to_archive(
+                        os.path.basename(group["main"])
+                    )
+                    PhotosFileAdapter().move_photo_to_archive(
+                        os.path.basename(group["crop"])
+                    )
+                except Exception as e:
+                    error_text = f"Error moving files to archive {e}"
+                    logging.error(error_text)
 
                 logging.debug(f"Published message {result} to pubsub.")
                 i_photo_count += 1