Refactoring + bug fix

common/helpers.py

@@ -7,25 +7,28 @@ def download_photo(url, save_path):
   with open(save_path, 'wb') as file:
     file.write(response.content)
 
-def save_data(dump, dump_folder, update_progress, min_percent=50):
-  update_progress(min_percent, 'Скачиваю фото и формирую дамп...')
-  for i, (id, value) in enumerate(dump.items()):
-    folder_path = os.path.join(dump_folder, f'{value["name"]}_{id}')
-    os.makedirs(folder_path)
-
-    for photo_url in value['photos']:
-      file_name = photo_url.split("/")[-1]
-      save_path = os.path.join(folder_path, file_name)
-      download_photo(photo_url, save_path)
-
-    with open(os.path.join(folder_path, 'chat.txt'), 'w') as file:
-      for message in value['messages']:
-        name = f'[{value["name"] if message["from"] == id else "Me"}]'
-        file.write(f'{name}: {message["message"]}' + '\n')
+def save_data(dump, dump_folder, update_progress, min_percent=0.5):
+    total_items = len(dump)
+    percent_range = 1 - min_percent
+    
+    update_progress(min_percent, 'Скачиваю изображения и формирую дамп...')
     
-    percent_range = 100 - min_percent
-    percent = (((i + 1) / len(dump)) * percent_range + min_percent) / 100
-    update_progress(percent, 'Скачиваю фото и формирую дамп...')
+    for i, (id, value) in enumerate(dump.items(), start=1):
+        folder_path = os.path.join(dump_folder, f'{value["name"]}_{id}')
+        os.makedirs(folder_path, exist_ok=True)
+        
+        for photo_url in value['photos']:
+            file_name = photo_url.split("/")[-1]
+            save_path = os.path.join(folder_path, file_name)
+            download_photo(photo_url, save_path)
+        
+        with open(os.path.join(folder_path, 'chat.txt'), 'w') as file:
+            for message in value['messages']:
+                name = f'[{value["name"] if message["from"] == id else "Me"}]'
+                file.write(f'{name}: {message["message"]}\n')
+        
+        percent = ((i / total_items) * percent_range + min_percent)
+        update_progress(percent, 'Скачиваю изображения и формирую дамп...')
 
 def create_folder(folder_name):
     if os.path.exists(folder_name):

common/tinderwrapper.py

@@ -38,7 +38,7 @@ class TinderWrapper():
   def get_photos(self, person):
     return [photo['url'] for photo in person['photos']]
 
-  def create_dump(self, update_progress, max_percent=50, last_activity_date='1997-03-25T22:49:41.151Z'):
+  def create_dump(self, update_progress, max_percent=0.5, last_activity_date='1997-03-25T22:49:41.151Z'):
     update_progress(0, 'Выполняю запрос в Tinder...')
     updates = self.get_updates(last_activity_date)['matches']
     update_progress(0, 'Обрабатываю ответ Tinder...')