Prefix exported user files with file type

misago/threads/signals.py

@@ -131,17 +131,17 @@ def archive_user_attachments(sender, archive=None, **kwargs):
     for attachment in chunk_queryset(queryset):
         archive.add_model_file(
             attachment.file,
-            prefix=attachment.uploaded_on.strftime('%H%M%S'),
+            prefix=attachment.uploaded_on.strftime('%H%M%S-file'),
             date=attachment.uploaded_on,
         )
         archive.add_model_file(
             attachment.image,
-            prefix=attachment.uploaded_on.strftime('%H%M%S'),
+            prefix=attachment.uploaded_on.strftime('%H%M%S-image'),
             date=attachment.uploaded_on,
         )
         archive.add_model_file(
             attachment.thumbnail,
-            prefix=attachment.uploaded_on.strftime('%H%M%S'),
+            prefix=attachment.uploaded_on.strftime('%H%M%S-thumbnail'),
             date=attachment.uploaded_on,
         )
 

misago/users/signals.py

@@ -48,10 +48,10 @@ def archive_user_profile_fields(sender, archive=None, **kwargs):
 
 @receiver(archive_user_data)
 def archive_user_avatar(sender, archive=None, **kwargs):
-    archive.add_model_file(sender.avatar_tmp, directory='avatar')
-    archive.add_model_file(sender.avatar_src, directory='avatar')
+    archive.add_model_file(sender.avatar_tmp, directory='avatar', prefix='tmp')
+    archive.add_model_file(sender.avatar_src, directory='avatar', prefix='src')
     for avatar in sender.avatar_set.iterator():
-        archive.add_model_file(avatar.image, directory='avatar')
+        archive.add_model_file(avatar.image, directory='avatar', prefix=avatar.size)
 
 
 @receiver(archive_user_data)