Added percents

app.py

@@ -30,9 +30,9 @@ if st.button('Запуск'):
     wrapper = TinderWrapper(access_token)
     dump_folder = 'dump'
     create_folder(dump_folder)
-    dump = wrapper.create_dump()
-    save_data(dump, dump_folder)
+    dump = wrapper.create_dump(update_progress)
+    save_data(dump, dump_folder, update_progress)
     shutil.make_archive('output', 'zip', dump_folder)
     with open('output.zip', 'rb') as f:
-        st.download_button('Download Zip', f, file_name='archive.zip')
+        st.download_button('Download Zip', f, file_name='output.zip')
 

common/helpers.py

@@ -7,8 +7,8 @@ def download_photo(url, save_path):
   with open(save_path, 'wb') as file:
     file.write(response.content)
 
-def save_data(dump, dump_folder):
-  for id, value in dump.items():
+def save_data(dump, dump_folder, update_progress, min_percent=50):
+  for i, (id, value) in enumerate(dump.items()):
     folder_path = os.path.join(dump_folder, f'{value["name"]}_{id}')
     os.makedirs(folder_path)
 
@@ -21,6 +21,10 @@ def save_data(dump, dump_folder):
       for message in value['messages']:
         name = f'[{value["name"] if message["from"] == id else "Me"}]'
         file.write(f'{name}: {message["message"]}' + '\n')
+    
+    percent_range = 100 - min_percent
+    percent = ((i + 1) / len(dump)) * percent_range + min_percent
+    update_progress(percent, 'Скачиваю фото и формирую дамп...')
 
 def create_folder(folder_name):
     if os.path.exists(folder_name):

common/tinderwrapper.py

@@ -42,10 +42,10 @@ class TinderWrapper():
       photo_urls.append(photo['url'])
     return photo_urls
 
-  def create_dump(self, last_activity_date='1997-03-25T22:49:41.151Z'):
+  def create_dump(self, update_progress, max_percent=50, last_activity_date='1997-03-25T22:49:41.151Z'):
     updates = self.get_updates(last_activity_date)['matches']
     output = {}
-    for update in updates:
+    for i, update in enumerate(updates):
       person = update['person']
       photos = self.get_photos(person)
       person_id = person['_id']
@@ -56,5 +56,7 @@ class TinderWrapper():
           'messages': messages,
           'photos': photos
       }
+      percent = ((i + 1) / len(updates)) * max_percent
+      update_progress(percent, 'Обрабатываю ответ Tinder..')
     
     return output