From 44f11f036269dcb5ec85bc1d01d2866f2a52999e Mon Sep 17 00:00:00 2001
From: Frank Fischer <frank-fischer@shadow-soft.de>
Date: Mon, 14 Dec 2020 11:35:18 +0100
Subject: [PATCH] Changes `download_url` to `download_urls` returning a list of
 potential urls.

The archives for some Qt versions are located under
`.../new_archive/...` instead of `.../archive/...`.

Addresses issue #34
---
 support/generate_bindings.cr | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/support/generate_bindings.cr b/support/generate_bindings.cr
index 884ec21..0379e24 100644
--- a/support/generate_bindings.cr
+++ b/support/generate_bindings.cr
@@ -45,8 +45,9 @@ struct QtVersion
     "qt-everywhere#{@infix}-src-#{@name}.0"
   end
 
-  def download_url
-    "https://download.qt.io/archive/qt/#{@name}/#{@name}.0/single/#{base_name}.tar.xz"
+  def download_urls
+    ["https://download.qt.io/archive/qt/#{@name}/#{@name}.0/single/#{base_name}.tar.xz",
+     "https://download.qt.io/new_archive/qt/#{@name}/#{@name}.0/single/#{base_name}.tar.xz"]
   end
 
   def path
@@ -92,18 +93,23 @@ end
 def download_missing_qts(versions)
   urls = versions
     .reject{|v| File.file? v.archive_path}
-    .map{|v| v.download_url}
+    .map{|v| v.download_urls}
 
   if urls.empty?
     report_step "All Qt sources already present"
     return
   end
 
-  arguments = [ "--remote-name-all", "--location" ] + urls
-
   report_step "Downloading missing Qt sources (#{versions.map{|v|v.name}.join(", ")})"
-  Dir.cd TEMPDIR do
-    system("curl", arguments)
+
+  urls.each do |version_urls|
+    version_urls.each do |url|
+      arguments = [ "--fail", "--remote-name-all", "--location", url ]
+
+      break if Dir.cd TEMPDIR do
+        system("curl", arguments)
+      end
+    end
   end
 end