Tidier market check launching

diff --git a/checkmarket.py b/checkmarket.py
new file mode 100755 (executable)
index 0000000..47a212b
--- /dev/null
+++ b/checkmarket.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+#
+# checkmarket.py - part of the FDroid server tools
+# Copyright (C) 2011, Ciaran Gultnieks, ciaran@ciarang.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import subprocess
+
+#Read configuration...
+repo_name = None
+repo_description = None
+repo_icon = None
+repo_url = None
+execfile('config.py')
+
+subprocess.call('./run.sh ' + market_user + ' ' + market_password
+    + ' ' + market_deviceid,
+    cwd='marketcheck', shell=True)
+

diff --git a/config.sample.py b/config.sample.py
index bdfc022d8e677fc4548a2518866cc7113b75f61b..e6615dab32d117f2b449da26686f84d1bbaec5cb 100644 (file)
--- a/config.sample.py
+++ b/config.sample.py
@@ -39,4 +39,9 @@ keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"
 keyaliases = {}
 keyaliases['com.example.app'] = 'example'
 
+#For the market checker, which is used only to determine a 'current' version
+#that the developer recommends, for those apps that are there.
+market_user = ""
+market_password = ""
+market_deviceid = ""
 

diff --git a/marketcheck/test.java b/marketcheck/test.java
index 68d1ddfab92db7b8bdbff01923a1473bbe7b1a14..28431806b24fca526b5e926c77c301a52dffc204 100644 (file)
--- a/marketcheck/test.java
+++ b/marketcheck/test.java
@@ -20,13 +20,14 @@ class test {
      */\r
     public static void main(String[] args) {\r
         try {\r
-            if(args.length < 2) {\r
+            if(args.length < 3) {\r
                 System.out.println("Parameters :\n" +\r
-                        "email password");\r
+                        "email password deviceid");\r
                 return;\r
             }\r
             String login = args[0];\r
             String password = args[1];\r
+            String deviceid = args[2];\r
 \r
             // Get a list of apps we want to check - i.e. those that\r
             // we have metadata files for...\r
@@ -45,7 +46,7 @@ class test {
 \r
             MarketSession session = new MarketSession();\r
 \r
-            session.getContext().setAndroidId("353027030727248");\r
+            session.getContext().setAndroidId(deviceid);\r
             session.getContext().setDeviceAndSdkVersion("sapphire:7");\r
             System.out.println("Login...");\r
             session.login(login,password);\r