From 99b893368bdb3e043a544f68ccf30845309d1f78 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 17 Oct 2018 14:16:31 +0100
Subject: [PATCH] Catalogs: multiple download URLs (mirrors) supported
---
catalog/catalog.py | 8 +++++++-
catalog/update-catalog.py | 19 +++++++++++++++----
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/catalog/catalog.py b/catalog/catalog.py
index b13320b..c6641ce 100644
--- a/catalog/catalog.py
+++ b/catalog/catalog.py
@@ -213,7 +213,7 @@ def append_author_nodes(node, info):
# traditional single author string
node.append( make_xml_leaf('author', info['author']) )
-def make_aircraft_node(aircraftDirName, package, variants, downloadBase):
+def make_aircraft_node(aircraftDirName, package, variants, downloadBase, mirrors):
#print "package:", package
#print "variants:", variants
package_node = ET.Element('package')
@@ -262,9 +262,15 @@ def make_aircraft_node(aircraftDirName, package, variants, downloadBase):
package_node.append( make_xml_leaf('dir', aircraftDirName) )
+ # primary URL is first
download_url = downloadBase + aircraftDirName + '.zip'
package_node.append( make_xml_leaf('url', download_url) )
+ for m in mirrors:
+ mu = m + aircraftDirName + '.zip'
+ package_node.append( make_xml_leaf('url', mu) )
+
+
if 'thumbnail' in package:
thumbnail_url = downloadBase + 'thumbnails/' + aircraftDirName + '_' + package['thumbnail']
package_node.append( make_xml_leaf('thumbnail', thumbnail_url) )
diff --git a/catalog/update-catalog.py b/catalog/update-catalog.py
index d6730aa..bbcf4fb 100755
--- a/catalog/update-catalog.py
+++ b/catalog/update-catalog.py
@@ -30,6 +30,7 @@ parser.add_argument("dir", help="Catalog directory")
args = parser.parse_args()
includes = []
+mirrors = [] # mirror base URLs
# xml node (robust) get text helper
def get_xml_text(e):
@@ -132,6 +133,7 @@ def process_aircraft_dir(name, repo_path):
global output_dir
global valid_zips
global previews_dir
+ global mirrors
aircraft_dir = os.path.join(repo_path, name)
if not os.path.isdir(aircraft_dir):
@@ -146,7 +148,7 @@ def process_aircraft_dir(name, repo_path):
if not args.quiet:
print "%s:" % name,
- package_node = catalog.make_aircraft_node(name, package, variants, download_base)
+ package_node = catalog.make_aircraft_node(name, package, variants, download_base, mirrors)
download_url = download_base + name + '.zip'
if 'thumbnail' in package:
@@ -256,9 +258,18 @@ else:
# SCM providers
scm_list = config_node.findall('scm')
upload_node = config_node.find('upload')
-download_base = get_xml_text(config_node.find('download-url'))
-if not download_base.endswith('/'):
- download_base += '/'
+
+download_base = None
+for i in config_node.findall("download-url"):
+ url = get_xml_text(i)
+ if not url.endswith('/'):
+ url += '/'
+
+ if download_base == None:
+ # download_base is the first entry
+ download_base = url
+ else:
+ mirrors.append(url)
output_dir = get_xml_text(config_node.find('local-output'))
if output_dir == '':