mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-04 23:02:02 +01:00
cleanup
This commit is contained in:
parent
4717308c4d
commit
0a774625a1
1 changed files with 9 additions and 11 deletions
|
@ -114,7 +114,7 @@ def md5Checksums( sums, filePath ):
|
|||
if filePath in sums:
|
||||
result = sums[filePath]
|
||||
else:
|
||||
logging.debug( "opening %s" % (k_filebase + "and_wordlists/" + filePath))
|
||||
# logging.debug( "opening %s" % (k_filebase + "and_wordlists/" + filePath))
|
||||
try:
|
||||
file = open( k_filebase + "and_wordlists/" + filePath, 'rb' )
|
||||
md5 = hashlib.md5()
|
||||
|
@ -145,7 +145,7 @@ def openShelf():
|
|||
if not k_SUMS in s_shelf: s_shelf[k_SUMS] = {}
|
||||
if not k_COUNT in s_shelf: s_shelf[k_COUNT] = 0
|
||||
s_shelf[k_COUNT] += 1
|
||||
logging.debug( "Count now %d" % s_shelf[k_COUNT] )
|
||||
# logging.debug( "Count now %d" % s_shelf[k_COUNT] )
|
||||
|
||||
def closeShelf():
|
||||
global s_shelf
|
||||
|
@ -560,15 +560,13 @@ def getUpdates( req, params ):
|
|||
result[k_DICTS] = dictsResult
|
||||
|
||||
# Let's not upgrade strings at the same time as we're upgrading the app
|
||||
if appResult:
|
||||
logging.debug( 'skipping xlation upgrade because app being updated' )
|
||||
elif k_XLATEINFO in asJson and k_NAME in asJson and k_STRINGSHASH in asJson:
|
||||
xlateResult = getXlate( asJson[k_XLATEINFO], asJson[k_NAME], asJson[k_STRINGSHASH] )
|
||||
if xlateResult:
|
||||
logging.debug( xlateResult )
|
||||
result[k_XLATEINFO] = xlateResult;
|
||||
else:
|
||||
logging.debug( "NOT FOUND xlate info" )
|
||||
# if appResult:
|
||||
# logging.debug( 'skipping xlation upgrade because app being updated' )
|
||||
# elif k_XLATEINFO in asJson and k_NAME in asJson and k_STRINGSHASH in asJson:
|
||||
# xlateResult = getXlate( asJson[k_XLATEINFO], asJson[k_NAME], asJson[k_STRINGSHASH] )
|
||||
# if xlateResult:
|
||||
# logging.debug( xlateResult )
|
||||
# result[k_XLATEINFO] = xlateResult;
|
||||
|
||||
result = json.dumps( result )
|
||||
# logging.debug( result )
|
||||
|
|
Loading…
Reference in a new issue