Keep ordering of newly added screenshots

webapp/publisher/snaps/logic.py

@@ -163,6 +163,8 @@ def build_changed_images(
     info = []
     images_files = []
     images_json = None
+
+    # Get screenshots info (existing and new) while keeping the order recieved
     for changed_screenshot in changed_screenshots:
         for current_screenshot in current_screenshots:
             if (
@@ -171,15 +173,7 @@ def build_changed_images(
             ):
                 info.append(current_screenshot)
                 break
-
-    # Add new icon
-    if icon is not None:
-        info.append(build_image_info(icon, "icon"))
-        images_files.append(icon)
-
-    # Add new screenshots
-    for new_screenshot in new_screenshots:
-        for changed_screenshot in changed_screenshots:
+        for new_screenshot in new_screenshots:
             is_same = (
                 changed_screenshot["status"] == "new"
                 and changed_screenshot["name"] == new_screenshot.filename
@@ -190,6 +184,12 @@ def build_changed_images(
                 if image_built not in info:
                     info.append(image_built)
                     images_files.append(new_screenshot)
+                    break
+
+    # Add new icon
+    if icon is not None:
+        info.append(build_image_info(icon, "icon"))
+        images_files.append(icon)
 
     images_json = {"info": dumps(info)}