[trails] Fix webdav importer

vrobbler/apps/scrobbles/importers/webdav.py

@@ -11,10 +11,16 @@ from webdav.client import get_webdav_client
 
 logger = logging.getLogger(__name__)
 
+DEFAULT_GPX_PATH = "var/gpx/"
+DEFAULT_KOREADER_PATH = "var/koreader/"
+
 
 def import_from_webdav_for_all_users(restart=False):
     """Grab a list of all users with WebDAV enabled and kickoff imports for them"""
 
+    koreader_path = (
+        DEFAULT_KOREADER_PATH + "statistics.sqlite3"
+    )  # TODO Allow configuring this in user settings
     webdav_enabled_user_ids = UserProfile.objects.filter(
         webdav_url__isnull=False,
         webdav_user__isnull=False,
@@ -30,7 +36,7 @@ def import_from_webdav_for_all_users(restart=False):
         webdav_client = get_webdav_client(user_id)
 
         try:
-            webdav_client.info("var/koreader/statistics.sqlite3")
+            webdav_client.info(koreader_path)
             koreader_found = True
         except:
             koreader_found = False
@@ -39,6 +45,8 @@ def import_from_webdav_for_all_users(restart=False):
                 extra={"user_id": user_id},
             )
 
+        trail_gpx_import_count += scan_webdav_for_gpx(webdav_client, user_id)
+
         if koreader_found:
             last_import = (
                 KoReaderImport.objects.filter(
@@ -48,8 +56,7 @@ def import_from_webdav_for_all_users(restart=False):
                 .last()
             )
 
-            koreader_file_path = fetch_file_from_webdav(1)
-            new_hash = get_file_md5_hash(koreader_file_path)
+            new_hash = get_file_md5_hash(fetch_file_from_webdav(1))
             old_hash = None
             if last_import:
                 old_hash = last_import.file_md5_hash()
@@ -81,29 +88,31 @@ def import_from_webdav_for_all_users(restart=False):
             process_koreader_import.delay(koreader_import.id)
             koreader_import_count += 1
 
-        trail_gpx_import_count += scan_webdav_for_gpx(webdav_client, user_id)
-
     return koreader_import_count, trail_gpx_import_count
 
 
 def scan_webdav_for_gpx(webdav_client, user_id):
+    gpx_path = DEFAULT_GPX_PATH  # TODO allow this to be configured in user settings
     try:
-        webdav_client.info("gpx/")
+        webdav_client.info(DEFAULT_GPX_PATH)
     except:
-        logger.info("No gpx/ directory on webdav", extra={"user_id": user_id})
+        logger.info("No var/gpx/ directory on webdav", extra={"user_id": user_id})
         return 0
 
     try:
-        files = webdav_client.list("gpx/")
+        files = webdav_client.list(gpx_path)
     except Exception as e:
-        logger.warning("Could not list gpx/", extra={"user_id": user_id, "error": str(e)})
+        logger.warning(
+            "Could not list var/gpx/", extra={"user_id": user_id, "error": str(e)}
+        )
         return 0
 
     gpx_extensions = (".gpx", ".fit")
     new_imports = 0
     already_imported = set(
-        TrailGPXImport.objects.filter(user_id=user_id)
-        .values_list("original_filename", flat=True)
+        TrailGPXImport.objects.filter(user_id=user_id).values_list(
+            "original_filename", flat=True
+        )
     )
 
     for fname in files:
@@ -116,7 +125,9 @@ def scan_webdav_for_gpx(webdav_client, user_id):
 
         tmp = tempfile.NamedTemporaryFile(delete=False, suffix=fname)
         try:
-            webdav_client.download_sync(remote_path=f"gpx/{fname}", local_path=tmp.name)
+            webdav_client.download_sync(
+                remote_path=f"{gpx_path}/{fname}", local_path=tmp.name
+            )
             imp = TrailGPXImport.objects.create(
                 user_id=user_id,
                 original_filename=fname,