From 8f2b84869876c33ce6d86e5a6b3acbf4c3465668 Mon Sep 17 00:00:00 2001
From: Mikkel Hjortshoej <fyoucon@gmail.com>
Date: Sat, 11 Apr 2020 21:48:44 +0200
Subject: Make the json for nightly have friendly URLs

---
 ci/create_nightly_json.py | 7 ++++---
 ci/create_nightly_json.sh | 5 -----
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 ci/create_nightly_json.sh

(limited to 'ci')

diff --git a/ci/create_nightly_json.py b/ci/create_nightly_json.py
index 4baffe365..43193a65d 100644
--- a/ci/create_nightly_json.py
+++ b/ci/create_nightly_json.py
@@ -1,7 +1,8 @@
 import subprocess
 import sys
 import json
-import datetime;
+import datetime
+import urllib.parse
 
 def main():
     files_by_date = {}
@@ -12,9 +13,9 @@ def main():
         if parts[0]:
             json_str = execute_cli(f"b2 get-file-info {parts[0]}")
             data = json.loads(json_str)
-            url = execute_cli(f"b2 make-url {data['fileId']}").strip()
-            sha1 = data['contentSha1']
             name = remove_prefix(data['fileName'], "nightly/")
+            url = f"https://f001.backblazeb2.com/file/odin-binaries/nightly/{urllib.parse.quote_plus(name)}"
+            sha1 = data['contentSha1']
             ts = int(data['fileInfo']['src_last_modified_millis'])
             date = datetime.datetime.fromtimestamp(ts/1000).strftime('%Y-%m-%d')
             
diff --git a/ci/create_nightly_json.sh b/ci/create_nightly_json.sh
deleted file mode 100644
index 184423195..000000000
--- a/ci/create_nightly_json.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-FILE_IDS=$(b2 ls --long odin-binaries nightly | cut -d ' ' -f 1)
-
-while IFS= read -r line; do
-    echo "... $line ..."
-done <<< "$list"
\ No newline at end of file
-- 
cgit v1.2.3