Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

bring in recent tweak

Browse source
This commit is contained in:
Eric House 2012-08-21 08:02:36 -07:00
parent 31ef5026be
commit 02fa53cbc7
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/android/scripts/info.py
View file

@ -31,13 +31,11 @@ k_urlbase = "http://eehouse.org/"
k_versions = { 'org.eehouse.android.xw4': { k_versions = { 'org.eehouse.android.xw4': {
'version' : 42, 'version' : 42,
k_AVERS : 42, k_AVERS : 42,
k_GVERS : 'android_beta_50-25-gcc4549e',
k_URL : 'xw4/android/XWords4-release_android_beta_50-25-gcc4549e.apk', k_URL : 'xw4/android/XWords4-release_android_beta_50-25-gcc4549e.apk',
}, },
'org.eehouse.android.xw4sms' : { 'org.eehouse.android.xw4sms' : {
'version' : 42, 'version' : 42,
k_AVERS : 42, k_AVERS : 42,
k_GVERS : 'android_beta_50-25-gcc4549e',
k_URL : 'xw4/android/sms/XWords4-release_android_beta_50-25-gcc4549e.apk', k_URL : 'xw4/android/sms/XWords4-release_android_beta_50-25-gcc4549e.apk',
}, },
} }
@ -88,7 +86,7 @@ def getDictSums():
logging.debug( "Count now %d" % s_shelf[k_COUNT] ) logging.debug( "Count now %d" % s_shelf[k_COUNT] )
return s_shelf[k_SUMS] return s_shelf[k_SUMS]
# public # public, but deprecated
def curVersion( req, name, avers = 41, gvers = None, installer = None ): def curVersion( req, name, avers = 41, gvers = None, installer = None ):
global k_versions global k_versions
result = { k_SUCCESS : True } result = { k_SUCCESS : True }
@ -103,16 +101,13 @@ def curVersion( req, name, avers = 41, gvers = None, installer = None ):
if versions[k_AVERS] > int(avers): if versions[k_AVERS] > int(avers):
logging.debug( avers + " is old" ) logging.debug( avers + " is old" )
result[k_URL] = k_urlbase + versions[k_URL] result[k_URL] = k_urlbase + versions[k_URL]
elif versions[k_AVERS] != avers:
logging.debug( avers + " is old" )
result[k_URL] = k_urlbase + versions[k_URL]
else: else:
logging.debug(name + " is up-to-date") logging.debug(name + " is up-to-date")
else: else:
logging.debug( 'Error: bad name ' + name ) logging.debug( 'Error: bad name ' + name )
return json.dumps( result ) return json.dumps( result )
# public # public, but deprecated
def dictVersion( req, name, lang, md5sum ): def dictVersion( req, name, lang, md5sum ):
result = { k_SUCCESS : True } result = { k_SUCCESS : True }
if not name.endswith(k_suffix): name += k_suffix if not name.endswith(k_suffix): name += k_suffix
@ -146,10 +141,11 @@ def getApp( params ):
if k_DEVOK in params and params[k_DEVOK]: versions = k_versions_dbg if k_DEVOK in params and params[k_DEVOK]: versions = k_versions_dbg
else: versions = k_versions else: versions = k_versions
if name in versions: if name in versions:
if versions[name][k_AVERS] > int(avers): versForName = versions[name]
result = {k_URL: k_urlbase + versions[name][k_URL]} if versForName[k_AVERS] > int(avers):
elif not gvers == versions[name][k_GVERS]: result = {k_URL: k_urlbase + versForName[k_URL]}
result = {k_URL: k_urlbase + versions[name][k_URL]} elif k_GVERS in versForName and not gvers == versForName[k_GVERS]:
result = {k_URL: k_urlbase + versForName[k_URL]}
else: else:
logging.debug(name + " is up-to-date") logging.debug(name + " is up-to-date")
else: else: