mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-08 18:31:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

added 'mirrors' option to config for giving official mirror URLs

Browse source 
serverwebroot has long supported uploading to multiple servers, this bit of
metadata communicates those official mirrors to the client so that it can
automatically do something useful with that information.

closes #14 https://gitlab.com/fdroid/fdroidserver/issues/14
This commit is contained in:
Hans-Christoph Steiner 2016-02-16 23:43:23 +01:00
parent a7a053c4f5
commit 3967a0068b
3 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fdroidserver/update.py
View file

@ -27,6 +27,7 @@ import socket
import zipfile
import hashlib
import pickle
import urlparse
from datetime import datetime, timedelta
from xml.dom.minidom import Document
from argparse import ArgumentParser
@ -760,6 +761,15 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
repoel = doc.createElement("repo")
mirrorcheckfailed = False
for mirror in config.get('mirrors', []):
base = os.path.basename(urlparse.urlparse(mirror).path.rstrip('/'))
if config.get('nonstandardwebroot') is not True and base != 'fdroid':
logging.error("mirror '" + mirror + "' does not end with 'fdroid'!")
mirrorcheckfailed = True
if mirrorcheckfailed:
sys.exit(1)
if archive:
repoel.setAttribute("name", config['archive_name'])
if config['repo_maxage'] != 0:
@ -767,6 +777,9 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
repoel.setAttribute("icon", os.path.basename(config['archive_icon']))
repoel.setAttribute("url", config['archive_url'])
addElement('description', config['archive_description'], doc, repoel)
urlbasepath = os.path.basename(urlparse.urlparse(config['archive_url']).path)
for mirror in config.get('mirrors', []):
addElement('mirror', urlparse.urljoin(mirror, urlbasepath), doc, repoel)
else:
repoel.setAttribute("name", config['repo_name'])
@ -775,8 +788,11 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
repoel.setAttribute("icon", os.path.basename(config['repo_icon']))
repoel.setAttribute("url", config['repo_url'])
addElement('description', config['repo_description'], doc, repoel)
urlbasepath = os.path.basename(urlparse.urlparse(config['repo_url']).path)
for mirror in config.get('mirrors', []):
addElement('mirror', urlparse.urljoin(mirror, urlbasepath), doc, repoel)
repoel.setAttribute("version", "14")
repoel.setAttribute("version", "15")
repoel.setAttribute("timestamp", str(int(time.time())))
nosigningkey = False