From ec7ff8eb27e5de9a05eb7208b5644490021d6e2c Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Sat, 5 Oct 2019 07:05:31 +0100
Subject: [PATCH] Update Annotator Generator
---
annogen.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/annogen.py b/annogen.py
index f2d4afa..5b250cb 100644
--- a/annogen.py
+++ b/annogen.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python2
-program_name = "Annotator Generator v0.685 (c) 2012-19 Silas S. Brown"
+program_name = "Annotator Generator v0.686 (c) 2012-19 Silas S. Brown"
-# See http://people.ds.cam.ac.uk/ssb22/adjuster/annogen.html
+# See http://ssb22.user.srcf.net/adjuster/annogen.html
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1671,7 +1671,7 @@ int main(int argc,char*argv[]) {
#endif
"""
-# ANDROID: setDefaultTextEncodingName("utf-8") is included as it might be needed if you include file:///android_asset/ URLs in your app (files put into assets/) as well as remote URLs. (If including ONLY file URLs then you don't need to set the INTERNET permission in Manifest, but then you might as well pre-annotate the files and use a straightforward static HTML app like http://people.ds.cam.ac.uk/ssb22/gradint/html2apk.html )
+# ANDROID: setDefaultTextEncodingName("utf-8") is included as it might be needed if you include file:///android_asset/ URLs in your app (files put into assets/) as well as remote URLs. (If including ONLY file URLs then you don't need to set the INTERNET permission in Manifest, but then you might as well pre-annotate the files and use a straightforward static HTML app like http://ssb22.user.srcf.net/gradint/html2apk.html )
# Also we get shouldOverrideUrlLoading to return true for URLs that end with .apk .pdf .epub .mp3 etc so the phone's normal browser can handle those (search code below for ".apk" for the list) (TODO: API 1's shouldOverrideUrlLoading was deprecated in API 24; if they remove it, we may have to provide both to remain compatible?)
android_upload = all(x in os.environ for x in ["KEYSTORE_FILE","KEYSTORE_USER","KEYSTORE_PASS","SERVICE_ACCOUNT_KEY"]) and not os.environ.get("ANDROID_NO_UPLOAD","") # TODO: document ANDROID_NO_UPLOAD
android_manifest = r"""<?xml version="1.0" encoding="utf-8"?>
@@ -5242,7 +5242,7 @@ if main:
rm_f("bin/"+dirName0+".ap_")
rm_f("bin/"+dirName0+".apk")
if android_upload:
- import httplib2,googleapiclient.discovery,oauth2client.service_account # pip install google-api-python-client (or pip install --upgrade google-api-python-client if yours is too old)
+ import httplib2,googleapiclient.discovery,oauth2client.service_account # pip install google-api-python-client (or pip install --upgrade google-api-python-client if yours is too old). Might need pip install oauth2client also.
sys.stderr.write("Logging in... ")
service = googleapiclient.discovery.build('androidpublisher', 'v2', http=oauth2client.service_account.ServiceAccountCredentials.from_json_keyfile_name(os.environ['SERVICE_ACCOUNT_KEY'],'https://www.googleapis.com/auth/androidpublisher').authorize(httplib2.Http()))
eId = service.edits().insert(body={},packageName=jPackage).execute()['id']
--
GitLab