Index: channels/_generic.py ================================================================== --- channels/_generic.py +++ channels/_generic.py @@ -184,10 +184,12 @@ def load(self, category, force=False): # get data from cache or download if (force or not category in self.streams): __print__(dbg.PROC, "load", "update_streams") + self.parent.status("Updating streams...") + self.parent.status(-0.1) new_streams = self.update_streams(category) if new_streams: # check and modify entry; @@ -229,10 +231,12 @@ # self.liststore[category] = \ mygtk.do(lambda:mygtk.columns(self.gtk_list, self.datamap, self.prepare(self.streams[category]))) # set pointer self.current = category + self.parent.status("") + self.parent.status(1.0) pass # store current streams data def save(self): conf.save("cache/" + self.module, self.streams, gz=1) Index: channels/youtube.py ================================================================== --- channels/youtube.py +++ channels/youtube.py @@ -179,11 +179,10 @@ # retrieve and parse def update_streams(self, cat, force=0, search=None): entries = [] channels = self.categories[self.categories.index("my channels") + 1] - self.parent.status(-0.1) # Most Popular if cat == "mostPopular": #for row in self.api("feeds/api/standardfeeds/%s/most_popular"%conf.youtube_region, ver=2): # entries.append(self.wrap2(row)) @@ -226,11 +225,10 @@ # empty entries else: entries = [dict(title="Placeholder for subcategories", genre="./.", playing="./.", url="http://youtube.com/")] # done - self.parent.status(1.0) return entries # Search for channel name: @@ -251,12 +249,11 @@ def api(self, method, ver=3, pages=5, **params): items = [] # URL and default parameters (base_url, defaults) = self.service[ver] - #params = dict( defaults.items() | params.items() ) - params = dict( defaults, **params ) + params = dict( list(defaults.items()) + list(params.items()) ) # Retrieve data set while pages > 0: j = ahttp.get(base_url + method, params=params) #__print__(dbg.DATA, j) @@ -280,11 +277,11 @@ elif "nextPageToken" in data: params["pageToken"] = data["nextPageToken"] pages -= 1 else: pages = 0 - self.parent.status( (11 - 1.852 * pages) / 10.0 ) + self.parent.status( (10 - 1.852 * pages) / 10.5 ) return items Index: st2.py ================================================================== --- st2.py +++ st2.py @@ -420,18 +420,15 @@ while ((not text) and (type(text)==str) and len(sbar_msg)): sbar_msg.pop() mygtk.do(lambda:self.statusbar.pop(sbar_cid)) # progressbar if (type(text)==float): - __print__(dbg.PROC, "status.progressbar", float, text) if (text >= 999.0/1000): # completed mygtk.do(lambda:self.progress.hide()) else: # show percentage - __print__(dbg.PROC, "status.progressbar", dbg.ERR, "fraction") mygtk.do(lambda:self.progress.show() or self.progress.set_fraction(text)) if (text <= 0): # unknown state - __print__(dbg.PROC, "status.progressbar", dbg.STAT, "PULSE") mygtk.do(lambda:self.progress.pulse()) # add text elif (type(text)==str): sbar_msg.append(1) mygtk.do(lambda:self.statusbar.push(sbar_cid, text))