From fb8c743d3b8516bdd9ff7c21f8fb752279f2cb29 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 12 Mar 2020 15:53:24 +0700
Subject: [PATCH] sort before uploading assets

---
 tools/upload_release_files.py | 41 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/tools/upload_release_files.py b/tools/upload_release_files.py
index 35abd50..b7ee02c 100755
--- a/tools/upload_release_files.py
+++ b/tools/upload_release_files.py
@@ -4,32 +4,31 @@ import os
 import os.path
 import sys
 import uritemplate
+import glob
 
 sys.path.append("adabot")
 import github_requests as github
 
 exit_status = 0
 
-for dirpath, dirnames, filenames in os.walk("../bin"):
-    if not filenames:
-        continue
-    for filename in filenames:
-        full_filename = os.path.join(dirpath, filename)
-        label = filename.replace("adafruit-circuitpython-", "")
-        url_vars = {}
-        url_vars["name"] = filename
-        url_vars["label"] = label
-        url = uritemplate.expand(os.environ["UPLOAD_URL"], url_vars)
-        headers = {"content-type": "application/octet-stream"}
-        print(url)
-        with open(full_filename, "rb") as f:
-            response = github.post(url, data=f, headers=headers)
-        if not response.ok:
-            if response.status_code == 422 and response.json().get("errors", [{"code":""}])[0]["code"] == "already_exists":
-                print("File already uploaded. Skipping.")
-                continue
-            print("Upload of {} failed with {}.".format(filename, response.status_code))
-            print(response.text)
-            sys.exit(response.status_code)
+filepaths = list(glob.iglob('../bin/*/*', recursive=True))
+filepaths.sort()
+
+for full_filename in filepaths:
+    filename = os.path.basename(full_filename)
+    url_vars = {}
+    url_vars["name"] = filename
+    url = uritemplate.expand(os.environ["UPLOAD_URL"], url_vars)
+    headers = {"content-type": "application/octet-stream"}
+    print(url)
+    with open(full_filename, "rb") as f:
+        response = github.post(url, data=f, headers=headers)
+    if not response.ok:
+        if response.status_code == 422 and response.json().get("errors", [{"code":""}])[0]["code"] == "already_exists":
+            print("File already uploaded. Skipping.")
+            continue
+        print("Upload of {} failed with {}.".format(filename, response.status_code))
+        print(response.text)
+        sys.exit(response.status_code)
 
 sys.exit(exit_status)