From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 13 Dec 2011 22:39:29 +0000 (+0000)
Subject: Tidier market check launching
X-Git-Tag: 0.1~1201
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=436cc0c6d111311ce043d95fbb665298c4b8f41e;p=fdroidserver.git

Tidier market check launching
---

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