from_location returns a dictionnary

main.py

@@ -13,7 +13,6 @@ def main():
     gap = timedelta(minutes=30) # 30 minutes : time to check trafic before an event
     while True:
         # TODO feed heap
-        # then look for problems
 
         # sleep the min between 1 minute and the next event - gap
         next = timedelta(seconds=1) # TODO 1 minute
@@ -26,16 +25,18 @@ def main():
         # next event
         if not heap.empty() and heap.top().date-datetime.now() < gap:
             event = heap.pop()
+            print(event.description + " at " + event.location + ", " + str(event.date))
 
             # get useful ids of sources for this location
             ids_sources = source.from_location(event.location)
+            # flatten this dictionnary
+            ids_sources_flat = [item for (key, sublist) in ids_sources.items() for item in sublist]
             # grab info from internet for these sources
             sources=source.gen_sources(ids_sources)
             for src in sources:
-              if src.id in ids_sources and src.problem():
+              if src.id in ids_sources_flat and src.problem():
                 # there is a problem ! We notify the user...
                 notification.notify(src.message)
-            print(event.description + " at " + event.location + ", " + str(event.date))
 
 if __name__ == "__main__":
     main()

source.py

@@ -120,12 +120,10 @@ def transilien():
 
 def from_location(location):
     """return a list of source ids useful for location
-    TODO : for the moment returns all ids in config.sources"""
-    lists = [values for (name, values) in config.sources.items()]
-    # return flattened list
-    return [item for sublist in lists for item in sublist]
+    TODO : for the moment returns the whole config.sources"""
+    return config.sources
 
 def gen_sources(ids):
   return chain(ratp_trafic(),\
       transilien(),\
-      jcdecaux_vls(config.sources['jcdecaux_vls'])) # TODO filter out ids for jcdecaux
+      jcdecaux_vls(ids.get('jcdecaux_vls', [])))