revert busaddress patch and limit the number of districa call to solv…

…e infinite loop, ported the web interface

autoplayergui

@@ -101,8 +101,7 @@ class Main(object):
 
     #Connect to player
     DBusGMainLoop(set_as_default=True)
-    #uris = get_players_uri(pattern=".",busaddress=busaddress)
-    uris = list(get_players_uri(pattern="."))
+    uris = list(get_players_uri(pattern=".",busaddress=busaddress))
 
     if len(uris) >0 :
         uri=uris[0]

autoradio/autompris2.py

@@ -83,7 +83,7 @@ def __init__(self,player="AutoPlayer",session=0, busaddress=settings.busaddressp
 
         DBusGMainLoop(set_as_default=True)
 
-        uris = get_players_uri(pattern=".*"+player+"$",busaddress=busaddress)
+        uris = list(get_players_uri(pattern=".*"+player+"$",busaddress=busaddress))
 
         if len(uris) >0 :
             uri=uris[0]

autoradio/autoradio_core.py

@@ -144,7 +144,11 @@ class schedules(list):
     """
     multiple schedule object
     """
-
+    def __init__(self, *args, **kwargs):
+        super(schedules, self).__init__(*args, **kwargs)
+        self.districatimes=0
+
+
     def districa(self):
         '''
         english:
@@ -159,7 +163,9 @@ def districa(self):
         logging.debug("execute districa")
 
         needrecompute=False
-
+        recomputedtimes=0
+        self.districatimes += 0
+
         #Spots
         #v=0
         for v,schedulej in enumerate(self):
@@ -436,7 +442,9 @@ def get_all_refine(self,now=None,genfile=True):
 
         self.get_all(now,genfile)
         while self.districa():
-            pass
+            if (self.districatimes >= 20 ):
+                logging.error("districa do not converge: too many programs in few time")
+                break
         self.purge()
         self.sort()
 

autoradio/mpris2/decorator/utils.py

@@ -17,19 +17,24 @@ def _match_uri(name, pattern='.+'):
     '''
     return re.match(pattern, name)
 
-def get_session():
+
+def get_session(busaddress=None):
     '''
         @return: dbus.SessionBus.get_session()
     '''
-    return dbus.SessionBus.get_session()
 
-def get_uri(pattern='.'):
+    if busaddress is None:
+        return dbus.SessionBus.get_session()
+    else:
+        return dbus.bus.BusConnection(busaddress)
+
+def get_uri(pattern='.',busaddress=None):
     '''
     Return string of player bus name
     @param pattern=None: string RegEx that filter response
     @return: array string of players bus name
     '''
-    for item in get_session().list_names():
+    for item in get_session(busaddress).list_names():
         if _match_uri(item, pattern):
             yield item
 

autoradio/mpris2/utils.py

@@ -9,13 +9,13 @@
 from .decorator.utils import list_interfaces as _list_interfaces
 from .decorator.utils import implements as _implements
 
-def get_players_uri(pattern=''):
+def get_players_uri(pattern='',busaddress=None):
     '''
         Return string of player bus name
         @param pattern=None: string RegEx that filter response
         @return: array string of players bus name
     '''
-    return get_uri(Interfaces.MEDIA_PLAYER + '.*' + pattern)
+    return get_uri(Interfaces.MEDIA_PLAYER + '.*' + pattern,busaddress)
 
 
 def get_player_id_from_uri(uri):