Index: channels/peertube.py ================================================================== --- channels/peertube.py +++ channels/peertube.py @@ -154,38 +154,38 @@ # retrieve and parse def update_streams(self, cat, search=None): if search: + method = "search/videos" params = { - "tagsOneOf": search, + "search": search, "count": 100, - "sort": "-name", + "sort": "-match", "nsfw": "false" } elif not cat in self.catmap: return [] elif cat: + method = "videos" params = { "categoryOneOf": self.catmap[cat], "count": 100, "sort": "-publishedAt", "nsfw": "false" } # fetch + map self.status(0.9) - entries = [] - for video in self.api("videos", params): - #log.DATA(video) - entries.append(self.map_data(video)) - #log.EN(json.dumps(entries, indent=4)) - self.status(1.0) - return entries + #log.DATA(video) + return [ + self.map_data(video) for video in self.api(method, params) + ] # peertube entry to streamtunter2 dict def map_data(self, v): + #log.DATA(v) url = "http://" + v["channel"]["host"] return dict( uuid = v["uuid"], genre = v["category"]["label"], title = v["name"],