Index: channels/youtube.py ================================================================== --- channels/youtube.py +++ channels/youtube.py @@ -176,14 +176,14 @@ for row in self.api("search", type="video", regionCode=conf.youtube_region, q=search): entries.append( self.wrap3(row, {"genre": ""}) ) # Most Popular elif cat == "mostPopular": - #for row in self.api("feeds/api/standardfeeds/%s/most_popular"%conf.youtube_region, ver=2): - # entries.append(self.wrap2(row)) - for row in self.api("videos", chart="mostPopular", regionCode=conf.youtube_region): - entries.append( self.wrap3(row, {"genre": "mostPopular"}) ) + for row in self.api("feeds/api/standardfeeds/%s/most_popular"%conf.youtube_region, ver=2): + entries.append(self.wrap2(row)) + #for row in self.api("videos", chart="mostPopular", regionCode=conf.youtube_region): + # entries.append( self.wrap3(row, {"genre": "mostPopular"}) ) # Categories elif cat in self.videocat_id: for row in self.api("search", chart="mostPopular", videoCategoryId=self.videocat_id[cat], order="date", type="video"): entries.append( self.wrap3(row, {"genre": cat}) ) @@ -212,11 +212,11 @@ self.parent.status(i / 15.0) # empty entries else: - entries = [dict(title="Placeholder for subcategories", genre="./.", playing="./.", url="http://youtube.com/")] + return self.placeholder # done return entries