From 07c0613fce0d016d4d7fe87301765ce1bbed06a2 Mon Sep 17 00:00:00 2001
From: isra67 <isramko@gmail.com>
Date: Fri, 29 Sep 2017 08:32:25 +0200
Subject: [PATCH] auto update repository name + stop Internet checking +
 autoupdate at 3AM

---
 indoor.ini        |   1 +
 my_lib/config.py  |   1 +
 my_lib/config.pyc | Bin 4583 -> 4623 bytes
 my_lib/itools.py  |   3 +++
 my_lib/itools.pyc | Bin 2718 -> 2757 bytes
 pjindoor.py       |  23 +++++++++++++++++------
 runme.py          |   2 +-
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/indoor.ini b/indoor.ini
index f7db327..09be25f 100644
--- a/indoor.ini
+++ b/indoor.ini
@@ -66,6 +66,7 @@ masterpwd = 1
 buttonfactory = button_factory
 app_log = debug
 sip_log = debug
+update_repo = production
 tunnel_flag = 0
 app_upd = button_app_upd
 autoupdate = 0
diff --git a/my_lib/config.py b/my_lib/config.py
index 20c7ca0..d4a5ac2 100644
--- a/my_lib/config.py
+++ b/my_lib/config.py
@@ -56,6 +56,7 @@
             'app_log': 'error',
             'tunnel_flag': False,
             'autoupdate': 1,
+            'update_repo': 'production',
             'sip_log': 'error' }
 dict_about = {'app_name': 'Indoor 2.0',
             'app_ver': '2.0.0.0',
diff --git a/my_lib/config.pyc b/my_lib/config.pyc
index a169cc4ac2069e657c631e388c4bcfb403154c4c..ae19da265ba5a02550105dd1f223ce1b086793c3 100644
GIT binary patch
delta 474
zcmXYtyG}wu5Qb;D1rZRG#sD^2SfQXEt^$&X7%%8SRG?78Ai)qoI3(H|v9s9D+7~c9
zfDd4-O?&`}oe8~hM%>MQ|I9x#+072;9~RvDk<H>8z7;C)zx1R@I^C~l_qHgR00V$4
zpx`Rt8Yop8phB4eFh~*t43BFOP>Ob_8v&z$G4j>{<0J{dB#9kxV=O6ZoZ?3LB0N6a
z0o*0W0k{XZ07WP875i{2pg0Yf{WE6(4<NUAIMC_(`Z)_duia^3ucFmkO>L6WUK`6=
z^{i8Ew+8pdADze!`sR0iOre^}{dF_L#A%2TWP}Ob34%Wm^exl&s}c62jF^11rcH4U
z6Y|qK5-Is%^Ln?)&<uo&UZbH23c4EqS*5Abh|8`D9MtSL!ZDttipouDQhra(PM&j!
zj7{lsT!|-n=cuJ}Y#cH2jAO<L<CLHo3F&g9TU86}6&WQ)hH=Sg%Oz(<H08B3FJGOW
EUrlCVRR910

delta 445
zcmXZWPfG$p7zXfn+!Phv+`46TDaccQOjq61EOBGgl-9J|ASp*mkRtTbUFcE-&Am(4
zB4R&4eSq%WJJdChjzRCM?J&Q0=h=s4Zf3t`f>Ph_{r-HbHQ@h|aAt6KKAwXH+jjyF
z178M}M}S8`ZTf+$cp3p78-{UEEg4!^OaRv~TLGTLkpiB^Ap>6>jtmw@2gNnu>!6Ak
zHaTYnfajqHU@1WVE<lfgH3ocZ5RL;cLOE2jJ&sGsescagSkZoTze~vo-qG|TEjQt!
zqe?`H7}D_|OX1l3BCaJfPI-dR#H&wtCFwOKeEvSm+{#ldC#K~f(}X6QtYKfv7c4TY
zP>&I5q#Ho;MzvPYmWsNuQP+(^&OD&cM?_X=fpc~*9s<Xk+Z32Ynb;vJL>1{e5&f{;
iX_~u~?GZIXCr*e{B!nBpnR`K8DGF<gJEbCil!-r`7gv-3

diff --git a/my_lib/itools.py b/my_lib/itools.py
index 8f1834b..e7d7499 100644
--- a/my_lib/itools.py
+++ b/my_lib/itools.py
@@ -108,6 +108,9 @@ def get_info(cmd):
 # ##############################################################################
 
 def getINet():
+    "check the Internet connection"
+    return True		### stop checking
+
     info = '0'
 
     try: info = get_info('./checkinet.sh')
diff --git a/my_lib/itools.pyc b/my_lib/itools.pyc
index e42d9ed6cea4c1e1a2dbe43450c36c296cc1aee1..e9e7470faba277e031e3f85b9496337f292fecbd 100644
GIT binary patch
delta 118
zcmbOydQ_C1`7<vU=e@HV*>`gYTQD#%lrS&^r!X?qGB8vMFqAM(zQ`eOXaW{3VPXi@
zU;!#AmIV^Y8L7$H3MCn-3Z8i-sYQ9IB?`&;d3mYHC7JnolQ>n_#DI!|j3;YxhH~%$
OnG8%UOq*LdB^d$ScN_}<

delta 80
zcmX>qI!~0H`7<w<w9TQ7?7KPmO&Ay$QWzO(85k-B7)lr>U*(V&FkmQQWC$){VhGk?
h0ZRK#R^?P-GX}DP#3uW5hO+ShnGB4Z*KkTQ0szZW4~+l-

diff --git a/pjindoor.py b/pjindoor.py
index c2adade..07df0ac 100644
--- a/pjindoor.py
+++ b/pjindoor.py
@@ -833,6 +833,7 @@ def __init__(self, **kwargs):
 
         self.infinite_event = Clock.schedule_interval(self.infinite_loop, 6.9)
         Clock.schedule_interval(self.info_state_loop, 12.)
+        Clock.schedule_interval(self.auto_update_loop, 3600)
 
         Clock.schedule_once(self.checkNetStatus, 5.)
 	Clock.schedule_once(lambda dt: send_command('./diag.sh init'), 15)
@@ -1234,6 +1235,16 @@ def infinite_loop(self, dt):
 		    procs[idx] = self.displays[idx].initPlayer()
 
 
+    # ###############################################################
+    def auto_update_loop(self,dt):
+	"auto update ar 3:00AM"
+
+	h = datetime.datetime.now().hour
+	if h == 3:
+	    Logger.info('%s:' % whoami())
+	    App.get_running_app().appUpdateWorker()
+
+
     # ###############################################################
     def checkNetStatus(self, dt=20):
 	"test ETH status"
@@ -1245,11 +1256,13 @@ def checkNetStatus(self, dt=20):
 	    sendNodeInfo('[***]IPADDR: %s' % s[3])
 	except: s = []
 
-	if netlink.netstatus > 0: netlink.netstatus = getINet()
+	if netlink.netstatus > 0: netlink.netstatus = 1 if getINet() else -1
 
 	docall_button_global.btntext = '' if self.lib else 'No Licence'
 	docall_button_global.btntext = docall_button_global.btntext if len(s) >= 8 else 'Network ERROR'
 	docall_button_global.btntext = docall_button_global.btntext if netlink.netstatus > 0 else 'ETH ERROR'
+	if netlink.netstatus == -1: docall_button_global.btntext = 'Internet ERROR'
+
 	if '127.0.0.1' == config.get('system', 'ipaddress') and len(s) > 8:
 	    Logger.error('%s: network ipaddress %r' % (whoami(), s))
 
@@ -1267,8 +1280,6 @@ def checkNetStatus(self, dt=20):
 		Logger.error('%s: config %r' % (whoami(), config))
 #		docall_button_global.btntext = 'ERROR'
 
-#        Clock.schedule_once(self.checkNetStatus, 24.)
-
 
     # ###############################################################
     def reinitbackgroundtasks(self):
@@ -2390,9 +2401,9 @@ def appUpdateWorker(self):
 #	    send_command('./appdiff.sh')
 	    i2 = get_info('../app/appdiff.sh')
 	    i1 = get_info('./appdiff.sh')
-	else:
-	    MyAlertBox(titl='WARNING', txt='Success.\n\nApplication is going to restart!\n\nPress OK',
-		cb=self.popupClosed, ad=False).open()
+#	else:
+#	    MyAlertBox(titl='WARNING', txt='Success.\n\nApplication is going to restart!\n\nPress OK',
+#		cb=self.popupClosed, ad=False).open()
 
 
     # ###############################################################
diff --git a/runme.py b/runme.py
index 00ddc51..299e7a6 100644
--- a/runme.py
+++ b/runme.py
@@ -133,7 +133,7 @@ def update(self):
 	self.getSDcard()
 	self.getUptime()
 	self.getNetwork()
-	self.getINet()
+#	self.getINet()
 	self.getAudio()
 	self.getTunnel()
 	self.getNodeServer()