Remove xbmc.abortRequested flag

src/oe.py

@@ -34,6 +34,8 @@
 __media__ = '%s/resources/skins/Default/media' % __cwd__
 xbmcDialog = xbmcgui.Dialog()
 
+xbmcm = xbmc.Monitor()
+
 is_service = False
 conf_lock = False
 __busy__ = 0
@@ -483,7 +485,7 @@ def download_file(source, destination, silent=False):
 
         last_percent = 0
 
-        while not (xbmc.abortRequested or progress.iscanceled()):
+        while not (progress.iscanceled() or xbmcm.abortRequested()):
             part = response.read(32768)
 
             progress.sample(part)
@@ -504,7 +506,7 @@ def download_file(source, destination, silent=False):
         local_file.close()
         response.close()
 
-        if progress.iscanceled() or xbmc.abortRequested:
+        if progress.iscanceled() or xbmcm.abortRequested():
             os.remove(destination)
             return None
 
@@ -530,7 +532,7 @@ def copy_file(source, destination, silent=False):
 
         last_percent = 0
 
-        while not (xbmc.abortRequested or progress.iscanceled()):
+        while not (progress.iscanceled() or xbmcm.abortRequested()):
             part = source_file.read(32768)
 
             progress.sample(part)
@@ -551,7 +553,7 @@ def copy_file(source, destination, silent=False):
         source_file.close()
         destination_file.close()
 
-        if progress.iscanceled() or xbmc.abortRequested:
+        if progress.iscanceled() or xbmcm.abortRequested():
             os.remove(destination)
             return None
 
@@ -850,15 +852,15 @@ def reboot_counter(seconds=10, title=' '):
     reboot_dlg.create('LibreELEC %s' % title, ' ')
     reboot_dlg.update(0)
     wait_time = seconds
-    while seconds >= 0 and not reboot_dlg.iscanceled():
+    while seconds >= 0 and not (reboot_dlg.iscanceled() or xbmcm.abortRequested()):
         progress = round(1.0 * seconds / wait_time * 100)
         reboot_dlg.update(int(progress), _(32329) % seconds)
-        time.sleep(1)
+        xbmcm.waitForAbort(1)
         seconds = seconds - 1
-    if not reboot_dlg.iscanceled():
-        return 1
-    else:
+    if reboot_dlg.iscanceled() or xbmcm.abortRequested():
         return 0
+    else:
+        return 1
 
 
 def exit():

src/resources/lib/modules/bluetooth.py

@@ -60,8 +60,11 @@ def stop_service(self):
         try:
             self.oe.dbg_log('bluetooth::stop_service', 'enter_function', 0)
             if hasattr(self, 'discovery_thread'):
-                self.discovery_thread.stop()
-                del self.discovery_thread
+                try:
+                    self.discovery_thread.stop()
+                    del self.discovery_thread
+                except AttributeError:
+                    pass
             if hasattr(self, 'dbusBluezAdapter'):
                 self.dbusBluezAdapter = None
             self.oe.dbg_log('bluetooth::stop_service', 'exit_function', 0)
@@ -72,8 +75,11 @@ def exit(self):
         try:
             self.oe.dbg_log('bluetooth::exit', 'enter_function', 0)
             if hasattr(self, 'discovery_thread'):
-                self.discovery_thread.stop()
-                del self.discovery_thread
+                try:
+                    self.discovery_thread.stop()
+                    del self.discovery_thread
+                except AttributeError:
+                    pass
             self.clear_list()
             self.visible = False
             self.oe.dbg_log('bluetooth::exit', 'exit_function', 0)
@@ -1127,15 +1133,15 @@ def stop(self):
     def run(self):
         try:
             self.oe.dbg_log('bluetooth::discoveryThread::run', 'enter_function', 0)
-            while not self.stopped and not xbmc.abortRequested:
+            while not self.stopped and not self.oe.xbmcm.abortRequested():
                 current_time = time.time()
                 if current_time > self.last_run + 5:
                     if self.main_menu.getSelectedItem().getProperty('modul') != 'bluetooth' or not hasattr(self.oe.dictModules['bluetooth'], 'discovery_thread'):
                         self.oe.dictModules['bluetooth'].menu_connections(None)
                     self.last_run = current_time
                 if self.main_menu.getSelectedItem().getProperty('modul') != 'bluetooth':
                     self.stop()
-                time.sleep(1)
+                self.oe.xbmcm.waitForAbort(1)
             self.oe.dbg_log('bluetooth::discoveryThread::run', 'exit_function', 0)
         except Exception as e:
             self.oe.dbg_log('bluetooth::discoveryThread::run', 'ERROR: (' + repr(e) + ')', 4)
@@ -1164,15 +1170,15 @@ def run(self):
         try:
             self.oe.dbg_log('bluetooth::pinkeyTimer::run', 'enter_function', 0)
             self.endtime = self.start_time + self.runtime
-            while not self.stopped and not xbmc.abortRequested:
+            while not self.stopped and not self.oe.xbmcm.abortRequested():
                 current_time = time.time()
                 percent = round(100 / self.runtime * (self.endtime - current_time), 0)
                 self.parent.pinkey_window.getControl(1704).setPercent(percent)
                 if current_time >= self.endtime:
                     self.stopped = True
                     self.parent.close_pinkey_window()
                 else:
-                    time.sleep(1)
+                    self.oe.xbmcm.waitForAbort(1)
             self.oe.dbg_log('bluetooth::pinkeyTimer::run', 'exit_function', 0)
         except Exception as e:
             self.oe.dbg_log('bluetooth::pinkeyTimer::run', 'ERROR: (' + repr(e) + ')', 4)

src/resources/lib/modules/connman.py

@@ -1164,7 +1164,7 @@ def set_technologie(self, **kwargs):
                                 self.Technology.SetProperty('Powered', dbus.Boolean(True, variant_level=1))
                             if settings['Tethering']['value'] == '1' and dbus.String(settings['TetheringIdentifier']['value']) != '' \
                                 and dbus.String(settings['TetheringPassphrase']['value']) != '':
-                                time.sleep(5)
+                                self.oe.xbmcm.waitForAbort(5)
                                 self.Technology.SetProperty('TetheringIdentifier', dbus.String(settings['TetheringIdentifier']['value'],
                                                             variant_level=1))
                                 self.Technology.SetProperty('TetheringPassphrase', dbus.String(settings['TetheringPassphrase']['value'],
@@ -1277,7 +1277,7 @@ def dbus_error_handler(self, error):
                     if self.connect_attempt == 1:
                         self.log_error = 0
                         self.notify_error = 0
-                        time.sleep(5)
+                        self.oe.xbmcm.waitForAbort(5)
                         self.connect_network()
                     else:
                         self.log_error = 1

src/resources/lib/modules/system.py

@@ -481,7 +481,7 @@ def reset_xbmc(self, listItem=None):
                 reset_file.write('reset')
                 reset_file.close()
                 self.oe.winOeMain.close()
-                time.sleep(1)
+                self.oe.xbmcm.waitForAbort(1)
                 xbmc.executebuiltin('Reboot')
             self.oe.set_busy(0)
             self.oe.dbg_log('system::reset_xbmc', 'exit_function', 0)
@@ -498,7 +498,7 @@ def reset_oe(self, listItem=None):
                 reset_file.write('reset')
                 reset_file.close()
                 self.oe.winOeMain.close()
-                time.sleep(1)
+                self.oe.xbmcm.waitForAbort(1)
                 xbmc.executebuiltin('Reboot')
                 self.oe.set_busy(0)
             self.oe.dbg_log('system::reset_oe', 'exit_function', 0)
@@ -619,7 +619,7 @@ def do_restore(self, listItem=None):
                 if answer == 1:
                     if self.oe.reboot_counter(10, self.oe._(32371)) == 1:
                         self.oe.winOeMain.close()
-                        time.sleep(1)
+                        self.oe.xbmcm.waitForAbort(1)
                         xbmc.executebuiltin('Reboot')
                 else:
                     self.oe.dbg_log('system::do_restore', 'User Abort!', 0)

src/resources/lib/modules/updates.py

@@ -588,7 +588,7 @@ def do_autoupdate(self, listItem=None, silent=False):
                     subprocess.call('sync', shell=True, stdin=None, stdout=None, stderr=None)
                     if silent == False:
                         self.oe.winOeMain.close()
-                        time.sleep(1)
+                        self.oe.xbmcm.waitForAbort(1)
                         xbmc.executebuiltin('Reboot')
                 else:
                     delattr(self, 'update_in_progress')

src/resources/lib/oeWindows.py

@@ -655,7 +655,7 @@ def onClick(self, controlID):
 
             if controlID == 1500:
                 self.getControl(1390).setLabel('1')
-                time.sleep(0.5)
+                self.oe.xbmcm.waitForAbort(0.5)
                 self.is_last_wizard = True
                 self.getControl(1391).setLabel('')
                 self.getControl(self.buttons[3]['id']).setVisible(False)
@@ -693,7 +693,7 @@ def onClick(self, controlID):
                     xbmc.executebuiltin('UpdateAddonRepos')
                     langAddon = "InstallAddon(" + lang_new + ")"
                     xbmc.executebuiltin(langAddon)
-                    time.sleep(.5)
+                    self.oe.xbmcm.waitForAbort(0.5)
                     xbmc.executebuiltin('SendClick(10100,11)')
                     self.oe.write_setting('libreelec', 'wizard_completed', 'True')
                     self.visible = False