Index: ahttp.py ================================================================== --- ahttp.py +++ ahttp.py @@ -72,14 +72,14 @@ # read if post: r = session.post(url, params=params, headers=headers, timeout=7.5) else: - r = session.get(url, params=params, headers=headers, timeout=9.75) + r = session.get(url, params=params, headers=headers, verify=False, timeout=9.75) - log.HTTP(r.request.headers ); - log.HTTP(r.headers ); + log.HTTP(">>>", r.request.headers ); + log.HTTP("<<<", r.headers ); # finish, clean statusbar #progress_feedback(0.9) #progress_feedback("") Index: channels/internet_radio.py ================================================================== --- channels/internet_radio.py +++ channels/internet_radio.py @@ -39,11 +39,11 @@ class internet_radio (ChannelPlugin): # control data listformat = "pls" categories = [] - base_url = "http://www.internet-radio.com/" + base_url = "https://www.internet-radio.com/" # load genres def update_categories(self): @@ -79,11 +79,11 @@ ) # Is there a next page? if str(page+1) not in rx_pages.findall(html[-1]): break - self.parent.status(float(page)/float(max_pages+1)) +# self.parent.status(float(page)/float(max_pages+1)) # Alternatively try regex or pyquery parsing #log.HTTP(html) for use_rx in [not conf.pyquery, conf.pyquery]: try: @@ -93,10 +93,11 @@ except Exception as e: log.ERR(e) continue # fin + log.FINISHED("internet_radio.update_streams") return entries # Regex extraction def with_regex(self, html): Index: channels/youtube.py ================================================================== --- channels/youtube.py +++ channels/youtube.py @@ -72,11 +72,12 @@ audioformat = "video/youtube" titles = dict( genre="Channel", title="Title", playing="Playlist", bitrate=False, listeners=False ) # API config service = { - 2: [ "http://gdata.youtube.com/", + 2: [ "http://gdata.youtube.com/", + # deprecated on 2015-04-20, no /v3/ alternative, pertains "mostPopular" category only { "v": 2, "alt": "json", "max-results": 50, } Index: cli.py ================================================================== --- cli.py +++ cli.py @@ -38,12 +38,12 @@ # start def __init__(self, actions): # fake init - action.action.main = empty_parent() - action.action.main.current_channel = self.current_channel + action.main = empty_parent() + action.main.current_channel = self.current_channel # check if enough arguments, else help if not actions: a = self.help # first cmdline arg == action Index: config.py ================================================================== --- config.py +++ config.py @@ -477,11 +477,11 @@ # Printer def log_print(self, *args, **kwargs): # debug level method = self.method.upper() - if not method == "ERR": + if method != "ERR": if "debug" in conf and not conf.debug: return # color/prefix method = r"[{}[{}]".format(self.colors.get(method, "47m"), method) # output