use json to do app and all dict queries in one transaction

xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java

@@ -1,6 +1,6 @@
 /* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
 /*
- * Copyright 2010 by Eric House (xwords@eehouse.org).  All rights
+ * Copyright 2012 by Eric House (xwords@eehouse.org).  All rights
  * reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -42,6 +42,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class UpdateCheckReceiver extends BroadcastReceiver {
@@ -86,6 +87,8 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
 
     public static void checkVersions( Context context ) 
     {
+        DbgUtils.logf("checkVersions");
+        JSONObject params = new JSONObject();
         PackageManager pm = context.getPackageManager();
         String packageName = context.getPackageName();
         String installer = pm.getInstallerPackageName( packageName );
@@ -96,53 +99,96 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
             try { 
                 int versionCode = pm.getPackageInfo( packageName, 0 ).versionCode;
 
-                HttpPost post = makePost( context, "curVersion" );
+                JSONObject appParams = new JSONObject();
 
-                List<NameValuePair> nvp = new ArrayList<NameValuePair>();
+                appParams.put( "name", packageName );
-                nvp.add(new BasicNameValuePair( "name", packageName ) );
+                appParams.put( "avers", versionCode );
-                nvp.add( new BasicNameValuePair( "avers", 
+                appParams.put( "gvers", GitVersion.VERS );
-                                                 String.format( "%d", 
+                appParams.put( "installer", installer );
-                                                                versionCode ) ) );
+                params.put( "app", appParams );
-                nvp.add( new BasicNameValuePair( "gvers", GitVersion.VERS ) );
-                nvp.add( new BasicNameValuePair( "installer", installer ) );
-                String json = runPost( post, nvp );
-                String url = urlFromJson( json );
-                if ( null != url ) {
-                    ApplicationInfo ai = pm.getApplicationInfo( packageName, 0);
-                    String label = pm.getApplicationLabel( ai ).toString();
-                    Intent intent = 
-                        new Intent( Intent.ACTION_VIEW, Uri.parse(url) );
-                    String title = 
-                        Utils.format( context, R.string.new_app_availf, label );
-                    String body = context.getString( R.string.new_app_avail );
-                    Utils.postNotification( context, intent, title, body,
-                                            url.hashCode() );
-                }
             } catch ( PackageManager.NameNotFoundException nnfe ) {
                 DbgUtils.logf( "checkVersions: %s", nnfe.toString() );
+            } catch ( org.json.JSONException jse ) {
+                DbgUtils.loge( jse );
             }
         }
-
+        JSONArray dictParams = new JSONArray();
-        DictUtils.DictAndLoc[] list = DictUtils.dictList( context );
+        DictUtils.DictAndLoc[] dals = DictUtils.dictList( context );
-        for ( DictUtils.DictAndLoc dal : list ) {
+        for ( int ii = 0; ii < dals.length; ++ii ) {
+            DictUtils.DictAndLoc dal = dals[ii];
             switch ( dal.loc ) {
                 // case DOWNLOAD:
             case EXTERNAL:
             case INTERNAL:
                 String sum = DictUtils.getMD5SumFor( context, dal );
-                String url = checkDictVersion( context, dal, sum );
+                dictParams.put( makeDictParams( context, dal, sum, ii ) );
-                if ( null != url ) {
+            }
-                    Intent intent = new Intent( context, DictsActivity.class );
+        }
-                    intent.putExtra( NEW_DICT_URL, url );
+        if ( 0 < dictParams.length() ) {
-                    intent.putExtra( NEW_DICT_LOC, dal.loc.ordinal() );
+            try {
-                    String body = 
+                params.put( "dicts", dictParams );
-                        Utils.format( context, R.string.new_dict_availf,
+            } catch ( org.json.JSONException jse ) {
-                                      dal.name );
+                DbgUtils.loge( jse );
-                    Utils.postNotification( context, intent, 
+            }
-                                            R.string.new_dict_avail, 
+        }
-                                            body, url.hashCode() );
+
+        if ( 0 < params.length() ) {
+            HttpPost post = makePost( context, "getUpdates" );
+            String json = runPost( post, params );
+            makeNotificationsIf( context, json, pm, packageName, dals );
+        }
+    }
+
+    private static void makeNotificationsIf( Context context,
+                                             String jstr, PackageManager pm,
+                                             String packageName, 
+                                             DictUtils.DictAndLoc[] dals )
+    {
+        DbgUtils.logf( "makeNotificationsIf: %s", jstr );
+        try {
+            JSONObject jobj = new JSONObject( jstr );
+            if ( null != jobj ) {
+                if ( jobj.has( "app" ) ) {
+                    JSONObject app = jobj.getJSONObject( "app" );
+                    if ( app.has( "url" ) ) {
+                        String url = app.getString( "url" );
+                        ApplicationInfo ai = pm.getApplicationInfo( packageName, 0);
+                        String label = pm.getApplicationLabel( ai ).toString();
+                        Intent intent = 
+                            new Intent( Intent.ACTION_VIEW, Uri.parse(url) );
+                        String title = 
+                            Utils.format( context, R.string.new_app_availf, label );
+                        String body = context.getString( R.string.new_app_avail );
+                        Utils.postNotification( context, intent, title, body,
+                                                url.hashCode() );
+                    }
+                }
+                if ( jobj.has( "dicts" ) ) {
+                    JSONArray dicts = jobj.getJSONArray( "dicts" );
+                    for ( int ii = 0; ii < dicts.length(); ++ii ) {
+                        JSONObject dict = dicts.getJSONObject( ii );
+                        if ( dict.has( "url" ) && dict.has("index") ) {
+                            String url = dict.getString( "url" );
+                            int index = dict.getInt( "index" );
+                            DictUtils.DictAndLoc dal = dals[index];
+                            Intent intent = 
+                                new Intent( context, DictsActivity.class );
+                            intent.putExtra( NEW_DICT_URL, url );
+                            intent.putExtra( NEW_DICT_LOC, dal.loc.ordinal() );
+                            String body = 
+                                Utils.format( context, R.string.new_dict_availf,
+                                              dal.name );
+                            Utils.postNotification( context, intent, 
+                                                    R.string.new_dict_avail, 
+                                                    body, url.hashCode() );
+                        }
+                    }
                 }
             }
+        } catch ( org.json.JSONException jse ) {
+            DbgUtils.loge( jse );
+        } catch ( PackageManager.NameNotFoundException nnfe ) {
+            DbgUtils.loge( nnfe );
         }
     }
 
@@ -170,10 +216,14 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
         return new HttpPost( url );
     }
 
-    private static String runPost( HttpPost post, List<NameValuePair> nvp )
+    private static String runPost( HttpPost post, JSONObject params )
     {
         String result = null;
         try {
+            String jsonStr = params.toString();
+            DbgUtils.logf( "as string: %s", jsonStr );
+            List<NameValuePair> nvp = new ArrayList<NameValuePair>();
+            nvp.add(new BasicNameValuePair( "params", jsonStr ) );
             post.setEntity( new UrlEncodedFormEntity(nvp) );
 
             // Execute HTTP Post Request
@@ -194,19 +244,23 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
         return result;
     }
 
-    private static String checkDictVersion( Context context, 
+    private static JSONObject makeDictParams( Context context, 
-                                            DictUtils.DictAndLoc dal, 
+                                              DictUtils.DictAndLoc dal, 
-                                            String sum )
+                                              String sum, int index )
     {
+        JSONObject params = new JSONObject();
         int lang = DictLangCache.getDictLangCode( context, dal );
         String langStr = DictLangCache.getLangName( context, lang );
-        HttpPost post = makePost( context, "dictVersion" );
         List<NameValuePair> nvp = new ArrayList<NameValuePair>();
-        nvp.add( new BasicNameValuePair( "name", dal.name ) );
+        try {
-        nvp.add( new BasicNameValuePair( "lang", langStr ) );
+            params.put( "name", dal.name );
-        nvp.add( new BasicNameValuePair( "md5sum", sum ) );
+            params.put( "lang", langStr );
-        String json = runPost( post, nvp );
+            params.put( "md5sum", sum );
-        return urlFromJson( json );
+            params.put( "index", index );
+        } catch ( org.json.JSONException jse ) {
+            DbgUtils.loge( jse );
+        }
+        return params;
     }
 
 }

xwords4/android/scripts/info.py

@@ -87,6 +87,67 @@ def dictVersion( req, name, lang, md5sum ):
     s_shelf.close()
     return json.dumps( result )
 
+def getApp( params ):
+    global k_versions
+    result = None
+    if 'avers' in params and 'name' in params and 'gvers' in params:
+        avers = params['avers']
+        name = params['name']
+        gvers = params['gvers']
+        if 'installer' in params: installer = params['installer']
+        else: installer = ''
+        logging.debug( "name: %s; avers: %s; installer: %s; gvers: %s"
+                       % (name, avers, installer, gvers) )
+        if name in k_versions:
+            if True or k_versions[name]['version'] > int(avers):
+                result = {'url': k_urlbase + k_versions[name]['url']}
+            else:
+                logging.debug(name + " is up-to-date")
+        else:
+            logging.debug( 'Error: bad name ' + name )
+    else:
+        logging.debug( 'missing param' )
+    return result
+
+def getDicts( params ):
+    result = []
+    dictSums = getDictSums()
+    for param in params:
+        name = param['name']
+        lang = param['lang']
+        md5sum = param['md5sum']
+        index = param['index']
+        if not name.endswith(k_suffix): name += k_suffix
+        path = lang + "/" + name
+        if not path in dictSums:
+            sum = md5Checksum( dictSums, path )
+            if sum:
+                dictSums[path] = sum
+                s_shelf['sums'] = dictSums
+        if path in dictSums:
+            if True or dictSums[path] != md5sum:
+                cur = { 'url' : k_urlbase + "and_wordlists/" + path,
+                        'index' : index }
+                result.append( cur )
+        else:
+            logging.debug( path + " not known" )
+
+    if 0 == len(result): result = None
+    return result
+
+# public
+def getUpdates( req, params ):
+    result = { 'success' : True }
+    logging.debug( "getUpdates: got params: %s" % params )
+    asJson = json.loads( params )
+    if 'app' in asJson:
+        appResult = getApp( asJson['app'] )
+        if appResult: result['app'] = appResult
+    if 'dicts' in asJson:
+        dictsResult = getDicts( asJson['dicts'] )
+        if dictsResult: result['dicts'] = dictsResult
+    return json.dumps( result )
+
 def clearShelf():
     shelf = shelve.open(k_shelfFile)
     shelf['sums'] = {}