smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the `--zim-url` option ... optional. 

If not given, the zim_url is get from the `info.json`To revert
This commit is contained in:
Matthieu Gautier 2017-06-07 10:31:34 +02:00
parent 71650ffebd
commit b83efb7d7f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build_custom_app.py
View File

@ -48,11 +48,11 @@ def parse_args():
formatter_class=argparse.RawDescriptionHelpFormatter) formatter_class=argparse.RawDescriptionHelpFormatter)
parser.add_argument('--custom-app') parser.add_argument('--custom-app')
parser.add_argument('--travis-token') parser.add_argument('--travis-token')
parser.add_argument('--zim-url')
advance = parser.add_argument_group('advance', "Some advanced options.") advance = parser.add_argument_group('advance', "Some advanced options.")
advance.add_argument('--extra-code', type=int, default=0) advance.add_argument('--extra-code', type=int, default=0)
advance.add_argument('--check-certificate', default=True) advance.add_argument('--check-certificate', default=True)
advance.add_argument('--zim-url', default=None)
advance.add_argument('--no-android-upload', action='store_false', dest='android_upload') advance.add_argument('--no-android-upload', action='store_false', dest='android_upload')
# Hidden options # Hidden options
@ -65,8 +65,11 @@ def parse_args():
options = parser.parse_args() options = parser.parse_args()
if not options.package_name: if not options.package_name or not options.zim_url:
print("Try to get package name from info.json file") if not options.package_name:
print("Try to get package name from info.json file")
if not options.zim_url:
print("Try to get zim url from info.json file")
request_url = ('https://raw.githubusercontent.com/kiwix/kiwix-android-custom/master/{}/info.json' request_url = ('https://raw.githubusercontent.com/kiwix/kiwix-android-custom/master/{}/info.json'
.format(options.custom_app)) .format(options.custom_app))
json_request = requests.get(request_url) json_request = requests.get(request_url)
@ -75,8 +78,12 @@ def parse_args():
print("Reason is '{}'".format(json_request.reason)) print("Reason is '{}'".format(json_request.reason))
sys.exit(-1) sys.exit(-1)
json_data = json.loads(json_request.text) json_data = json.loads(json_request.text)
print("Found package_name '{}'".format(json_data['package'])) if not options.package_name:
options.package_name = json_data['package'] print("Found package_name '{}'".format(json_data['package']))
options.package_name = json_data['package']
if not options.zim_url:
print("Found zim_url '{}'".format(json_data['zim_url']))
options.zim_url = json_data['zim_url']
options.base_version = "{}{}".format( options.base_version = "{}{}".format(
datetime.date.today().strftime('%y%j'), datetime.date.today().strftime('%y%j'),