Merge branch 'master' of https://muxi.at/git/diez/unusualarchive

import.py

@@ -1,6 +1,7 @@
 import os
 import re
 import sys
+import fnmatch
 from datetime import datetime
 
 sys.path.append('./')
@@ -10,7 +11,7 @@ django.setup()
 from django.contrib.auth.models import User
 from core.models import Video
 
-folder_path = 'channel_archiver/UnusualVideos (@UnusualVideos)/'
+folder_path = './channel_archiver/UnusualVideos (@UnusualVideos)/'
 
 def extract_version(filename):
     # Define a regular expression pattern to match the version number
@@ -26,6 +27,14 @@ def extract_version(filename):
         # If no match is found, return None
         return None
 
+def find_image_file(name_pattern, folder):
+    pattern = re.compile('.*{}.*\.(jpg|png|webp)'.format(name_pattern), re.IGNORECASE)
+    for root, dirs, files in os.walk(folder):
+        for filename in files:
+            if pattern.match(filename):
+                return os.path.join(root, filename)
+    return None
+
 
 for filename in os.listdir(folder_path):
     if filename.endswith('.mp4'):
@@ -45,9 +54,8 @@ for filename in os.listdir(folder_path):
         with open(os.path.join(folder_path, filename), 'rb') as f:
             video.file.save(filename, f)
 
-        filename = filename[:-3] + "webp"
-        filepath = os.path.join(folder_path, filename)
-        if os.path.exists(filepath):
+        filepath = find_image_file("V"+str(id), folder_path)
+        if filepath and os.path.exists(filepath):
             with open(filepath, 'rb') as f:
                 video.thumbnail.save(filename, f)