Changes On Branch 1beab0563e727323
Changes In Branch py3 Through [1beab0563e] Excluding Merge-Ins
This is equivalent to a diff from 7ef1553f61 to 1beab0563e
2014-04-27
| ||
22:19 | Python3 support back into trunk check-in: 9ecea4fb26 user: mario tags: trunk | |
2014-04-11
| ||
01:24 | remove pson fallback check-in: eabee8e3c9 user: mario tags: py3 | |
2014-04-10
| ||
04:31 | * Fixed gtk_list_store_get_value: assertion `column < list_store->n_columns' by removing {width:20} reference from treeview datamap. * row.setdefault() for absent search_col/set and deleted state * More __print__/dbg colorization * Disabled pson.filter_data in favour of str casting in mygtk.columns() * Removed streamactions.popup PY2/PY3 workaround with named args * More .iteritems() removal check-in: 1beab0563e user: mario tags: py3 | |
2014-04-09
| ||
00:23 | Temporary fix for Gtk undefined color warnings, workaround for changed GtkMenu.popup() signature in Gtk3. Debug colors for mygtk.columns() creation. check-in: 489da08a74 user: mario tags: py3 | |
2014-04-08
| ||
21:16 | rename http to ahttp to avoid conflict with Python3 modules, change .iteritems and xrange, remove same remaining plain print statements check-in: d3b1418bc6 user: mario tags: py3 | |
2014-04-07
| ||
00:33 | Move __print__ into config, add unified dbg.COLOR codes check-in: 7ef1553f61 user: mario tags: trunk | |
2014-04-06
| ||
02:16 | rename ui.xml to gtk2.xml for parity with gtk3.xml; Gtk3 suddenly works with gi 1.33 (well, lots of errors still, but main window ok) check-in: e7a0fb24c8 user: mario tags: trunk | |
Modified _package.epm from [d2e2c94cae] to [789f724b9f].
︙ | ︙ | |||
33 34 35 36 37 38 39 | f 644 root root /usr/share/pixmaps/streamtuner2.png ./logo.png f 644 root root /usr/share/streamtuner2/gtk2.xml ./gtk2.xml f 644 root root /usr/share/streamtuner2/gtk3.xml ./gtk3.xml f 644 root root /usr/share/streamtuner2/pson.py ./pson.py #f 644 root root /usr/share/streamtuner2/processing.py ./processing.py f 644 root root /usr/share/streamtuner2/action.py ./action.py f 644 root root /usr/share/streamtuner2/config.py ./config.py | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | f 644 root root /usr/share/pixmaps/streamtuner2.png ./logo.png f 644 root root /usr/share/streamtuner2/gtk2.xml ./gtk2.xml f 644 root root /usr/share/streamtuner2/gtk3.xml ./gtk3.xml f 644 root root /usr/share/streamtuner2/pson.py ./pson.py #f 644 root root /usr/share/streamtuner2/processing.py ./processing.py f 644 root root /usr/share/streamtuner2/action.py ./action.py f 644 root root /usr/share/streamtuner2/config.py ./config.py f 644 root root /usr/share/streamtuner2/ahttp.py ./ahttp.py f 644 root root /usr/share/streamtuner2/cli.py ./cli.py f 644 root root /usr/share/streamtuner2/mygtk.py ./mygtk.py f 644 root root /usr/share/streamtuner2/favicon.py ./favicon.py f 644 root root /usr/share/streamtuner2/kronos.py ./kronos.py f 644 root root /usr/share/streamtuner2/pq.py ./pq.py #-- channels d 755 root root /usr/share/streamtuner2/channels - |
︙ | ︙ |
Modified action.py from [fc0650246a] to [a3c14ebdbb].
︙ | ︙ | |||
19 20 21 22 23 24 25 | # # # import re import os | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | # # # import re import os import ahttp as http from config import conf, __print__, dbg import platform main = None |
︙ | ︙ | |||
43 44 45 46 47 48 49 | # media formats mf = {"mp3":"audio/mp3", "ogg":"audio/ogg", "aac":"audio/aac"} # web @staticmethod def browser(url): | | | | | | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | # media formats mf = {"mp3":"audio/mp3", "ogg":"audio/ogg", "aac":"audio/aac"} # web @staticmethod def browser(url): __print__( dbg.CONF, conf.browser ) action.run(conf.browser + " " + action.quote(url)) # os shell cmd escaping @staticmethod def quote(s): if conf.windows: return str(s) # should actually be "\\\"%s\\\"" % s else: return "%r" % str(s) # calls player for stream url and format @staticmethod def play(url, audioformat="audio/mp3", listformat="text/x-href"): if (url): url = action.url(url, listformat) if (audioformat): if audioformat == "audio/mpeg": audioformat = "audio/mp3" # internally we use the more user-friendly moniker cmd = conf.play.get(audioformat, conf.play.get("*/*", "vlc %u")) __print__( dbg.PROC,"play", url, cmd ) try: action.run( action.interpol(cmd, url) ) except: pass # exec wrapper @staticmethod def run(cmd): if conf.windows: os.system("start \"%s\"") else: os.system(cmd + " &") # streamripper @staticmethod def record(url, audioformat="audio/mp3", listformat="text/x-href", append="", row={}): __print__( dbg.PROC, "record", url ) cmd = conf.record.get(audioformat, conf.record.get("*/*", None)) try: action.run( action.interpol(cmd, url, row) + append ) except: pass # save as .m3u @staticmethod |
︙ | ︙ | |||
187 188 189 190 191 192 193 | return url # download a .pls resource and extract urls @staticmethod def pls(url): text = http.get(url) | | | 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | return url # download a .pls resource and extract urls @staticmethod def pls(url): text = http.get(url) __print__( dbg.DATA, "pls_text=", text ) return re.findall("\s*File\d*\s*=\s*(\w+://[^\s]+)", text, re.I) # currently misses out on the titles # get a single direct ICY stream url (extract either from PLS or M3U) @staticmethod def srv(url): return action.extract_urls(url)[0] |
︙ | ︙ | |||
222 223 224 225 226 227 228 | # use shoutcast unique stream id if available stream_id = re.search("http://.+?/.*?(\d+)", pls, re.M) stream_id = stream_id and stream_id.group(1) or "XXXXXX" try: channelname = main.current_channel except: channelname = "unknown" | | | | | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | # use shoutcast unique stream id if available stream_id = re.search("http://.+?/.*?(\d+)", pls, re.M) stream_id = stream_id and stream_id.group(1) or "XXXXXX" try: channelname = main.current_channel except: channelname = "unknown" return (str(conf.tmp) + os.sep + "streamtuner2."+channelname+"."+stream_id+".m3u", len(stream_id) > 3 and stream_id != "XXXXXX") # check if there are any urls in a given file @staticmethod def has_urls(tmp_fn): if os.path.exists(tmp_fn): return open(tmp_fn, "r").read().find("http://") > 0 # create a local .m3u file from it @staticmethod def m3u(pls): # temp filename (tmp_fn, unique) = action.tmp_fn(pls) # does it already exist? if tmp_fn and unique and conf.reuse_m3u and action.has_urls(tmp_fn): return tmp_fn # download PLS __print__( dbg.DATA, "pls=",pls ) url_list = action.extract_urls(pls) __print__( dbg.DATA, "urls=", url_list ) # output URL list to temporary .m3u file if (len(url_list)): #tmp_fn = f = open(tmp_fn, "w") f.write("#M3U\n") f.write("\n".join(url_list) + "\n") f.close() # return path/name of temporary file return tmp_fn else: __print__( dbg.ERR, "error, there were no URLs in ", pls ) raise "Empty PLS" # open help browser @staticmethod def help(*args): action.run("yelp /usr/share/doc/streamtuner2/help/") #or action.browser("/usr/share/doc/streamtuner2/") #class action |
Added ahttp.py version [a715d3203a].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | # # encoding: UTF-8 # api: streamtuner2 # type: functions # title: http download / methods # description: http utility # version: 1.4 # # Provides a http GET method with gtk.statusbar() callback. # And a function to add trailings slashes on http URLs. # # from compat2and3 import urllib2, urlencode, urlparse, cookielib, StringIO, xrange, PY3 from gzip import GzipFile from config import conf, __print__, dbg #-- url download --------------------------------------------- #-- chains to progress meter and status bar in main window feedback = None # sets either text or percentage, so may take two parameters def progress_feedback(*args): # use reset values if none given if not args: args = ["", 1.0] # send to main win if feedback: try: [feedback(d) for d in args] except: pass #-- GET def get(url, maxsize=1<<19, feedback="old"): __print__( dbg.HTTP, "GET", url) # statusbar info progress_feedback(url, 0.0) # read content = "" f = urllib2.urlopen(url) max = 222000 # mostly it's 200K, but we don't get any real information read_size = 1 # multiple steps while (read_size and len(content) < maxsize): # partial read add = f.read(8192) content = content + add read_size = len(add) # set progress meter progress_feedback(float(len(content)) / float(max)) # done # clean statusbar progress_feedback() # fin __print__( dbg.INFO, "Content-Length", len(content) ) return content #-- fix invalid URLs def fix_url(url): if url is None: url = "" if len(url): # remove whitespace url = url.strip() # add scheme if (url.find("://") < 0): url = "http://" + url # add mandatory path if (url.find("/", 10) < 0): url = url + "/" return url # default HTTP headers for AJAX/POST request default_headers = { "User-Agent": "streamtuner2/2.1 (X11; U; Linux AMD64; en; rv:1.5.0.1) like WinAmp/2.1 but not like Googlebot/2.1", #"Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.2.6) Gecko/20100628 Ubuntu/10.04 (lucid) Firefox/3.6.6", "Accept": "*/*;q=0.5, audio/*, url/*", "Accept-Language": "en-US,en,de,es,fr,it,*;q=0.1", "Accept-Encoding": "gzip,deflate", "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.1", "Keep-Alive": "115", "Connection": "keep-alive", #"Content-Length", "56", #"Cookie": "s_pers=%20s_getnr%3D1278607170446-Repeat%7C1341679170446%3B%20s_nrgvo%3DRepeat%7C1341679170447%3B; s_sess=%20s_cc%3Dtrue%3B%20s_sq%3Daolshtcst%252Caolsvc%253D%252526pid%25253Dsht%25252520%2525253A%25252520SHOUTcast%25252520Radio%25252520%2525257C%25252520Search%25252520Results%252526pidt%25253D1%252526oid%25253Dfunctiononclick%25252528event%25252529%2525257BshowMoreGenre%25252528%25252529%2525253B%2525257D%252526oidt%25253D2%252526ot%25253DDIV%3B; aolDemoChecked=1.849061", "Pragma": "no-cache", "Cache-Control": "no-cache", } # simulate ajax calls def ajax(url, post, referer=""): # request headers = default_headers headers.update({ "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", "X-Requested-With": "XMLHttpRequest", "Referer": (referer if referer else url), }) if type(post) == dict: post = urlencode(post) request = urllib2.Request(url, post, headers) # open url __print__( dbg.INFO, vars(request) ) progress_feedback(url, 0.2) r = urllib2.urlopen(request) # get data __print__( dbg.HTTP, r.info() ) progress_feedback(0.5) data = r.read() progress_feedback() return data # http://techknack.net/python-urllib2-handlers/ class ContentEncodingProcessor(urllib2.BaseHandler): """A handler to add gzip capabilities to urllib2 requests """ # add headers to requests def http_request(self, req): req.add_header("Accept-Encoding", "gzip, deflate") return req # decode def http_response(self, req, resp): old_resp = resp # gzip if resp.headers.get("content-encoding") == "gzip": gz = GzipFile( fileobj=StringIO(resp.read()), mode="r" ) resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url, old_resp.code) resp.msg = old_resp.msg # deflate if resp.headers.get("content-encoding") == "deflate": gz = StringIO( deflate(resp.read()) ) resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url, old_resp.code) # 'class to add info() and geturl() methods to an open file.' resp.msg = old_resp.msg return resp # deflate support import zlib def deflate(data): # zlib only provides the zlib compress format, not the deflate format; try: # so on top of all there's this workaround: return zlib.decompress(data, -zlib.MAX_WBITS) except zlib.error: return zlib.decompress(data) #-- init for later use if urllib2: # config 1 handlers = [None, None, None] # base handlers[0] = urllib2.HTTPHandler() if conf.debug: handlers[0].set_http_debuglevel(3) # content-encoding handlers[1] = ContentEncodingProcessor() # store cookies at runtime cj = cookielib.CookieJar() handlers[2] = urllib2.HTTPCookieProcessor( cj ) # inject into urllib2 urllib2.install_opener( urllib2.build_opener(*handlers) ) # alternative function names AJAX=ajax POST=ajax GET=get URL=fix_url |
Modified channels/_generic.py from [f927301f5f] to [4cf18f9328].
︙ | ︙ | |||
19 20 21 22 23 24 25 | # adds the required gtk Widgets manually. # import gtk from mygtk import mygtk from config import conf, __print__, dbg | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | # adds the required gtk Widgets manually. # import gtk from mygtk import mygtk from config import conf, __print__, dbg import ahttp as http import action import favicon import os.path import xml.sax.saxutils import re import copy |
︙ | ︙ | |||
68 69 70 71 72 73 74 | gtk_cat = None #gtk widget # mapping of stream{} data into gtk treeview/treestore representation datamap = [ # coltitle width [ datasrc key, type, renderer, attrs ] [cellrenderer2], ... ["", 20, ["state", str, "pixbuf", {}], ], ["Genre", 65, ['genre', str, "t", {}], ], | | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | gtk_cat = None #gtk widget # mapping of stream{} data into gtk treeview/treestore representation datamap = [ # coltitle width [ datasrc key, type, renderer, attrs ] [cellrenderer2], ... ["", 20, ["state", str, "pixbuf", {}], ], ["Genre", 65, ['genre', str, "t", {}], ], ["Station Title",275,["title", str, "text", {"strikethrough":11, "cell-background":12, "cell-background-set":13}], ["favicon", gtk.gdk.Pixbuf, "pixbuf", {}], ], ["Now Playing",185, ["playing", str, "text", {"strikethrough":11}], ], #{"width":20} ["Listeners", 45, ["listeners", int, "t", {"strikethrough":11}], ], #["Max", 45, ["max", int, "t", {}], ], ["Bitrate", 35, ["bitrate", int, "t", {}], ], ["Homepage", 160, ["homepage", str, "t", {"underline":10}], ], [False, 25, ["url", str, "t", {"strikethrough":11}], ], [False, 0, ["format", str, None, {}], ], [False, 0, ["favourite", bool, None, {}], ], |
︙ | ︙ | |||
145 146 147 148 149 150 151 | self.gtk_cat = parent.get_widget(self.module+"_cat") # category tree self.display_categories() #mygtk.tree(self.gtk_cat, self.categories, title="Category", icon=gtk.STOCK_OPEN); # update column names | | | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | self.gtk_cat = parent.get_widget(self.module+"_cat") # category tree self.display_categories() #mygtk.tree(self.gtk_cat, self.categories, title="Category", icon=gtk.STOCK_OPEN); # update column names for field,title in list(self.titles.items()): self.update_datamap(field, title=title) # prepare stream list if (not self.rowmap): for row in self.datamap: for x in range(2, len(row)): self.rowmap.append(row[x][0]) # load default category if (self.current): self.load(self.current) else: mygtk.columns(self.gtk_list, self.datamap, [{}]) |
︙ | ︙ | |||
179 180 181 182 183 184 185 | # switch stream category, # load data, # update treeview content def load(self, category, force=False): # get data from cache or download | | | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | # switch stream category, # load data, # update treeview content def load(self, category, force=False): # get data from cache or download if (force or not category in self.streams): new_streams = self.update_streams(category) if new_streams: # modify [self.postprocess(row) for row in new_streams] |
︙ | ︙ | |||
233 234 235 236 237 238 239 | # finds differences in new/old streamlist, marks deleted with flag def deleted_streams(self, new, old): diff = [] new = [row.get("url","http://example.com/") for row in new] for row in old: | | | | 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 | # finds differences in new/old streamlist, marks deleted with flag def deleted_streams(self, new, old): diff = [] new = [row.get("url","http://example.com/") for row in new] for row in old: if (url in row and (row.get("url") not in new)): row["deleted"] = 1 diff.append(row) return diff # prepare data for display def prepare(self, streams): for i,row in enumerate(streams): # oh my, at least it's working # at start the bookmarks module isn't fully registered at instantiation in parent.channels{} - might want to do that step by step rather # then display() is called too early to take effect - load() & co should actually be postponed to when a notebook tab gets selected first # => might be fixed now, 1.9.8 # state icon: bookmark star if (conf.show_bookmarks and "bookmarks" in self.parent.channels and self.parent.bookmarks.is_in(streams[i].get("url", "file:///tmp/none"))): streams[i]["favourite"] = 1 # state icon: INFO or DELETE if (not row.get("state")): if row.get("favourite"): streams[i]["state"] = gtk.STOCK_ABOUT if conf.retain_deleted and row.get("deleted"): |
︙ | ︙ | |||
307 308 309 310 311 312 313 | if (self.shown != 55555): # if category tree is empty, initialize it if not self.categories: __print__(dbg.PROC, "first_show: reload_categories"); #self.parent.thread(self.reload_categories) | < | | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | if (self.shown != 55555): # if category tree is empty, initialize it if not self.categories: __print__(dbg.PROC, "first_show: reload_categories"); #self.parent.thread(self.reload_categories) self.reload_categories() self.display_categories() self.current = self.categories.keys()[0] __print__(dbg.STAT, self.current) self.load(self.current) # load current category else: __print__(dbg.STAT, "first_show: load current category"); self.load(self.current) |
︙ | ︙ |
Modified channels/basicch.py from [2ad035d297] to [c507665eb7].
︙ | ︙ | |||
8 9 10 11 12 13 14 | # realaudio archive is not available anymore. # # Needs manual initialisation of categories first. # import re | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # realaudio archive is not available anymore. # # Needs manual initialisation of categories first. # import re import ahttp as http from config import conf from channels import * from xml.sax.saxutils import unescape |
︙ | ︙ |
Modified channels/google.py from [3f0788927c] to [36a6ee6c2d].
︙ | ︙ | |||
47 48 49 50 51 52 53 | # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. import re, os, gtk from channels import * from xml.sax.saxutils import unescape as entity_decode, escape as xmlentities | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. import re, os, gtk from channels import * from xml.sax.saxutils import unescape as entity_decode, escape as xmlentities import ahttp as http ### constants ################################################################# GOOGLE_DIRECTORY_ROOT = "http://www.dmoz.org" CATEGORIES_URL_POSTFIX = "/Arts/Music/Sound_Files/MP3/Streaming/Stations/" |
︙ | ︙ |
Modified channels/internet_radio_org_uk.py from [4dcc6f65d4] to [6c77259f65].
︙ | ︙ | |||
11 12 13 14 15 16 17 | # from channels import * import re from config import conf, __print__, dbg | | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | # from channels import * import re from config import conf, __print__, dbg import ahttp as http from pq import pq # streams and gui class internet_radio_org_uk (ChannelPlugin): |
︙ | ︙ |
Modified channels/jamendo.py from [0df05c5caf] to [9d3d3ac039].
1 2 3 4 5 6 7 8 9 10 | # api: streamtuner2 # title: jamendo browser # # For now this is really just a browser, doesn't utilizt the jamendo API yet. # Requires more rework of streamtuner2 list display to show album covers. # import re | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | # api: streamtuner2 # title: jamendo browser # # For now this is really just a browser, doesn't utilizt the jamendo API yet. # Requires more rework of streamtuner2 list display to show album covers. # import re import ahttp as http from config import conf from channels import * from xml.sax.saxutils import unescape |
︙ | ︙ |
Modified channels/links.py from [692f83efe7] to [e2e193464a].
︙ | ︙ | |||
54 55 56 57 58 59 60 | bookmarks = parent.bookmarks if not bookmarks.streams.get(self.module): bookmarks.streams[self.module] = [] bookmarks.add_category(self.module) # collect links from channel plugins | | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | bookmarks = parent.bookmarks if not bookmarks.streams.get(self.module): bookmarks.streams[self.module] = [] bookmarks.add_category(self.module) # collect links from channel plugins for name,channel in parent.channels.items(): try: self.streams.append({ "favourite": 1, "title": channel.title, "homepage": channel.homepage, }) except: pass for title,homepage in self.default.items(): self.streams.append({ "title": title, "homepage": homepage, }) # add to bookmarks bookmarks.streams[self.module] = self.streams |
Modified channels/live365.py from [17860a6a46] to [10562bd5f9].
1 2 3 4 5 6 7 8 9 10 11 12 | # api: st2 # title: live365 channel # # 2.0.9 fixed by Abhisek Sanyal # # streamtuner2 modules from config import conf from mygtk import mygtk | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | # api: st2 # title: live365 channel # # 2.0.9 fixed by Abhisek Sanyal # # streamtuner2 modules from config import conf from mygtk import mygtk import ahttp as http from channels import * from config import __print__, dbg # python modules import re import xml.dom.minidom from xml.sax.saxutils import unescape as entity_decode, escape as xmlentities |
︙ | ︙ |
Modified channels/modarchive.py from [bf829e8b72] to [a906bb560c].
︙ | ︙ | |||
8 9 10 11 12 13 14 | # MOD files dodn't work with all audio players. And with the default # download method, it'll receive a .zip archive with embeded .mod file. # VLC in */* seems to work fine however. # import re | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # MOD files dodn't work with all audio players. And with the default # download method, it'll receive a .zip archive with embeded .mod file. # VLC in */* seems to work fine however. # import re import ahttp as http from config import conf from channels import * from config import __print__, dbg from xml.sax.saxutils import unescape |
︙ | ︙ |
Modified channels/musicgoal.py from [1d593a3fc6] to [faf1e3671e].
︙ | ︙ | |||
12 13 14 15 16 17 18 | # # st2 modules from config import conf from mygtk import mygtk | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | # # st2 modules from config import conf from mygtk import mygtk import ahttp as http from channels import * # python modules import re import json |
︙ | ︙ |
Modified channels/myoggradio.py from [37210dae1e] to [6c4dac0144].
︙ | ︙ | |||
22 23 24 25 26 27 28 | from channels import * from config import conf from action import action import re import json | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | from channels import * from config import conf from action import action import re import json from compat2and3 import StringIO import copy # open source radio sharing stie class myoggradio(ChannelPlugin): |
︙ | ︙ |
Modified channels/punkcast.py from [6f838d457b] to [57433ea58f].
1 2 3 4 5 6 7 8 9 10 11 | # api: streamtuner2 # title: punkcast listing # # # Disables itself per default. # ST1 looked prettier with random images within. # import re | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | # api: streamtuner2 # title: punkcast listing # # # Disables itself per default. # ST1 looked prettier with random images within. # import re import ahttp as http from config import conf import action from channels import * from config import __print__, dbg |
︙ | ︙ |
Modified channels/shoutcast.py from [3296716516] to [dd8d75b19e].
︙ | ︙ | |||
14 15 16 17 18 19 20 | # there's not a lot of information to fetch left. And this plugin is now back # to defaulting to regex extraction instead of HTML parsing & DOM extraction. # # # | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # there's not a lot of information to fetch left. And this plugin is now back # to defaulting to regex extraction instead of HTML parsing & DOM extraction. # # # import ahttp as http import urllib import re from config import conf, __print__, dbg from pq import pq #from channels import * # works everywhere but in this plugin(???!) import channels |
︙ | ︙ | |||
62 63 64 65 66 67 68 | # sub-categories are queried per 'AJAX' def update_categories(self): html = http.get(self.base_url) self.categories = [] __print__( dbg.DATA, html ) # <h2>Radio Genres</h2> | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | # sub-categories are queried per 'AJAX' def update_categories(self): html = http.get(self.base_url) self.categories = [] __print__( dbg.DATA, html ) # <h2>Radio Genres</h2> rx = re.compile(r'<li((?:\s+id="\d+"\s+class="files")?)><a href="\?action=sub&cat=([\w\s]+)#(\d+)">[\w\s]+</a>', re.S) sub = [] for uu in rx.findall(html): __print__( dbg.DATA, uu ) (main,name,id) = uu name = urllib.unquote(name) # main category if main: if sub: self.categories.append(sub) sub = [] |
︙ | ︙ |
Modified channels/timer.py from [c50adafaed] to [73a61c99cb].
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | # # Programmed events are visible in "timer" under the "bookmarks" channel. Times # are stored in the description field, and can thus be edited. However, after editing # times manually, streamtuner2 must be restarted for the changes to take effect. # from channels import * import kronos from mygtk import mygtk from action import action import copy | > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | # # Programmed events are visible in "timer" under the "bookmarks" channel. Times # are stored in the description field, and can thus be edited. However, after editing # times manually, streamtuner2 must be restarted for the changes to take effect. # from config import __print__, dbg from channels import * import kronos from mygtk import mygtk from action import action import copy |
︙ | ︙ | |||
72 73 74 75 76 77 78 | "timer_cancel": lambda w,*a: self.parent.timer_dialog.hide() or 1, }) # prepare spool self.sched = kronos.ThreadedScheduler() for row in self.streams: try: self.queue(row) | | | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | "timer_cancel": lambda w,*a: self.parent.timer_dialog.hide() or 1, }) # prepare spool self.sched = kronos.ThreadedScheduler() for row in self.streams: try: self.queue(row) except Exception as e: __print__(dbg.ERR, "queuing error", e) self.sched.start() # display GUI for setting timespec def edit_timer(self, *w): self.parent.timer_dialog.show() self.parent.timer_value.set_text("Fri,Sat 20:00-21:00 play") |
︙ | ︙ |
Modified channels/tv.py from [e09d4b20ac] to [2d1fa5a0ac].
︙ | ︙ | |||
14 15 16 17 18 19 20 | # Pasing with lxml is dead simple in this case, so we use etree directly # instead of PyQuery. Like with the Xiph plugin, downloaded streams are simply # stored in .streams["all"] pseudo-category. # # icon: http://cemagraphics.deviantart.com/art/Little-Tv-Icon-96461135 from channels import * | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # Pasing with lxml is dead simple in this case, so we use etree directly # instead of PyQuery. Like with the Xiph plugin, downloaded streams are simply # stored in .streams["all"] pseudo-category. # # icon: http://cemagraphics.deviantart.com/art/Little-Tv-Icon-96461135 from channels import * import ahttp as http import lxml.etree # TV listings from shoutcast.com class tv(ChannelPlugin): |
︙ | ︙ |
Modified channels/xiph.py from [6bbc72e8d5] to [e14b45bb99].
︙ | ︙ | |||
15 16 17 18 19 20 21 | # # streamtuner2 modules from config import conf from mygtk import mygtk | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | # # streamtuner2 modules from config import conf from mygtk import mygtk import ahttp as http from channels import * from config import __print__, dbg # python modules import re from xml.sax.saxutils import unescape as entity_decode, escape as xmlentities import xml.dom.minidom |
︙ | ︙ |
Modified cli.py from [a682821821] to [ea53579a96].
︙ | ︙ | |||
13 14 15 16 17 18 19 | # # # import sys #from channels import * | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | # # # import sys #from channels import * import ahttp import action from config import conf import json |
︙ | ︙ |
Added compat2and3.py version [13b56cb24d].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | # # encoding: UTF-8 # api: python # type: functions # title: Python2 and Python3 compatibility # version: 0.1 # # Renames some Python3 modules into their Py2 equivalent. # Slim local alternative to `six` module. # import sys # Python 2 if sys.version_info < (3,0): # version tags PY2 = 1 PY3 = 0 # basic functions xrange = xrange range = xrange unicode = unicode # urllib modules import urllib import urllib2 from urllib import urlencode import urlparse import cookielib # filesys from StringIO import StringIO # Python 3 else: # version tags PY2 = 0 PY3 = 1 # basic functions xrange = range unicode = str # urllib modules import urllib.request as urllib import urllib.request as urllib2 from urllib.parse import urlencode import urllib.parse as urlparse from http import cookiejar as cookielib # filesys from io import StringIO |
Modified config.py from [16fe14f094] to [8361dea5ee].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 | import os import sys import pson import gzip import platform #-- create a single instance of config object conf = object() | > > < > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | import os import sys import pson import gzip import platform #-- create a single instance of config object conf = object() #-- global configuration data --------------------------------------------- class ConfigDict(dict): # start def __init__(self): # object==dict means conf.var is conf["var"] self.__dict__ = self # let's pray this won't leak memory due to recursion issues |
︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 | last = self.load("settings") if (last): self.update(last) # store defaults in file else: self.save("settings") self.firstrun = 1 # some defaults def defaults(self): self.browser = "sensible-browser" self.play = { "audio/mp3": "audacious ", # %u for url to .pls, %g for downloaded .m3u "audio/ogg": "audacious ", | > | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | last = self.load("settings") if (last): self.update(last) # store defaults in file else: self.save("settings") self.firstrun = 1 # some defaults def defaults(self): self.browser = "sensible-browser" self.play = { "audio/mp3": "audacious ", # %u for url to .pls, %g for downloaded .m3u "audio/ogg": "audacious ", |
︙ | ︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 97 98 | self.auto_save_appstate = 1 self.theme = "" #"MountainDew" self.debug = False self.channel_order = "shoutcast, xiph, internet_radio_org_uk, jamendo, myoggradio, .." self.reuse_m3u = 1 self.google_homepage = 1 self.windows = platform.system()=="Windows" # each plugin has a .config dict list, we add defaults here def add_plugin_defaults(self, config, module=""): # options for opt in config: | > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | self.auto_save_appstate = 1 self.theme = "" #"MountainDew" self.debug = False self.channel_order = "shoutcast, xiph, internet_radio_org_uk, jamendo, myoggradio, .." self.reuse_m3u = 1 self.google_homepage = 1 self.windows = platform.system()=="Windows" self.debug = 1 # each plugin has a .config dict list, we add defaults here def add_plugin_defaults(self, config, module=""): # options for opt in config: |
︙ | ︙ | |||
177 178 179 180 181 182 183 | # check for existing filename in directory list def find_in_dirs(self, dirs, file): for d in dirs: if os.path.exists(d+"/"+file): return d+"/"+file | < < < < < | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | # check for existing filename in directory list def find_in_dirs(self, dirs, file): for d in dirs: if os.path.exists(d+"/"+file): return d+"/"+file # wrapper for all print statements def __print__(*args): if conf.debug: print(" ".join([str(a) for a in args])) |
︙ | ︙ | |||
203 204 205 206 207 208 209 210 211 | "CONF": "[33m[CONF][0m", # brown CONFIG DATA "UI": "[34m[UI][0m", # blue USER INTERFACE BEHAVIOUR "HTTP": "[35m[HTTP][0m", # magenta HTTP REQUEST "DATA": "[36m[DATA][0m", # cyan DATA "INFO": "[37m[INFO][0m", # gray INFO "STAT": "[37m[STATE][0m", # gray CONFIG STATE }) | > > > > > > > > > | 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | "CONF": "[33m[CONF][0m", # brown CONFIG DATA "UI": "[34m[UI][0m", # blue USER INTERFACE BEHAVIOUR "HTTP": "[35m[HTTP][0m", # magenta HTTP REQUEST "DATA": "[36m[DATA][0m", # cyan DATA "INFO": "[37m[INFO][0m", # gray INFO "STAT": "[37m[STATE][0m", # gray CONFIG STATE }) #-- actually fill global conf instance conf = ConfigDict() if conf: __print__(dbg.PROC, "ConfigDict() initialized") |
Modified favicon.py from [f5d4a162a1] to [983556d34c].
︙ | ︙ | |||
24 25 26 27 28 29 30 | always_google = 1 # use favicon service for speed only_google = 1 # if that fails, try our other/slower methods? delete_google_stub = 1 # don't keep placeholder images google_placeholder_filesizes = (726,896) import os, os.path | | < | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | always_google = 1 # use favicon service for speed only_google = 1 # if that fails, try our other/slower methods? delete_google_stub = 1 # don't keep placeholder images google_placeholder_filesizes = (726,896) import os, os.path from compat2and3 import xrange, urllib import re from config import conf try: from processing import Process as Thread except: from threading import Thread import ahttp # ensure that we don't try to download a single favicon twice per session, # if it's not available the first time, we won't get it after switching stations back and forth tried_urls = [] |
︙ | ︙ | |||
85 86 87 88 89 90 91 | # extract first title parts title = rx_t.search(row["title"]) if title: title = title.group(0).replace(" ", "%20") # do a google search | | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | # extract first title parts title = rx_t.search(row["title"]) if title: title = title.group(0).replace(" ", "%20") # do a google search html = ahttp.ajax("http://www.google.de/search?hl=de&q="+title, None) # find first URL hit url = rx_u.search(html) if url: row["homepage"] = ahttp.fix_url(url.group(1)) pass #----------------- # extract domain name def domain(url): |
︙ | ︙ | |||
191 192 193 194 195 196 197 | # try: # URL download r = urllib.urlopen(favicon) headers = r.info() # abort on if r.getcode() >= 300: | | | | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | # try: # URL download r = urllib.urlopen(favicon) headers = r.info() # abort on if r.getcode() >= 300: raise Error("HTTP error" + r.getcode()) if not headers["Content-Type"].lower().find("image/"): raise Error("can't use text/* content") # save file fn_tmp = fn+".tmp" f = open(fn_tmp, "wb") f.write(r.read(32768)) f.close() |
︙ | ︙ | |||
232 233 234 235 236 237 238 | favicon = "".join(rx.findall(html)) # url or if favicon.startswith("http://"): None # just /pathname else: | | | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | favicon = "".join(rx.findall(html)) # url or if favicon.startswith("http://"): None # just /pathname else: favicon = ahttp.urlparse.urljoin(url, favicon) #favicon = "http://" + domain(url) + "/" + favicon # download direct_download(favicon, file(url)) |
︙ | ︙ | |||
262 263 264 265 266 267 268 | # import operator import struct try: from PIL import BmpImagePlugin, PngImagePlugin, Image | | | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | # import operator import struct try: from PIL import BmpImagePlugin, PngImagePlugin, Image except Exception as e: print("no PIL", e) always_google = 1 only_google = 1 def load_icon(file, index=None): ''' |
︙ | ︙ |
Modified gtk3.xml from [b732c1a2e7] to [3026ea4f0c].
1 2 | <?xml version="1.0" encoding="UTF-8"?> <interface> | > | > < < < < < < < > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="search_dialog"> <property name="can_focus">False</property> <property name="opacity">0.95999999999999996</property> <property name="border_width">5</property> <property name="title" translatable="yes">station search</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> <property name="deletable">False</property> <property name="gravity">center</property> <signal name="close" handler="search_cancel" swapped="no"/> <signal name="delete-event" handler="search_cancel" swapped="no"/> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel"> <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="search_cancel" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkToggleButton" id="togglebutton1"> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkButton" id="google_search"> <property name="label" translatable="yes">google it</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Instead of searching in the station list, just look up the above search term on google.</property> <property name="relief">half</property> <signal name="clicked" handler="search_google" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkButton" id="server_search"> <property name="label" translatable="yes">query srv</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Instead of doing a cache search, go through the search functions on the directory service homepages. (UNIMPLEMENTED)</property> <property name="relief">half</property> <signal name="clicked" handler="search_srv" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkButton" id="cache_search"> <property name="label" translatable="yes">cache _search</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Start searching for above search term in the currently loaded station lists. Doesn't find *new* information, just looks through the known data.</property> <property name="use_underline">True</property> <signal name="clicked" handler="search_go" swapped="no"/> <accelerator key="Return" signal="activate"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">4</property> </packing> </child> |
︙ | ︙ | |||
275 276 277 278 279 280 281 282 283 284 285 286 287 288 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkCheckButton" id="search_channel_all"> <property name="label" translatable="yes">all channels</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkCheckButton" id="search_channel_all"> <property name="label" translatable="yes">all channels</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> </child> </object> <packing> |
︙ | ︙ | |||
361 362 363 364 365 366 367 | <child> <object class="GtkButton" id="cancel1"> <property name="label" translatable="yes"> </property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> | < < < < < | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 | <child> <object class="GtkButton" id="cancel1"> <property name="label" translatable="yes"> </property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_title"> <property name="label" translatable="yes">in title</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_description"> <property name="label" translatable="yes">in description</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_all"> <property name="label" translatable="yes">any fields</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkButton" id="cancel4"> <property name="label" translatable="yes"> </property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">4</property> </packing> |
︙ | ︙ | |||
460 461 462 463 464 465 466 | <child> <object class="GtkButton" id="cancel2"> <property name="label" translatable="yes"> </property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> | < < < < < | 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 | <child> <object class="GtkButton" id="cancel2"> <property name="label" translatable="yes"> </property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_homepage"> <property name="label" translatable="yes">homepage url</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_extra"> <property name="label" translatable="yes">extra info</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="search_in_genre"> <property name="label" translatable="yes">and genre</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkButton" id="cancel3"> <property name="label" translatable="yes"> </property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">4</property> </packing> |
︙ | ︙ | |||
688 689 690 691 692 693 694 | <child> <object class="GtkButton" id="timer_cancel"> <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> | < < | 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 | <child> <object class="GtkButton" id="timer_cancel"> <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="timer_cancel" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="timer_ok"> <property name="label" translatable="yes">ok</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="timer_ok" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> |
︙ | ︙ | |||
781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkEntry" id="timer_value"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="text" translatable="yes">Fri,Sat 20:00-21:00</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkEntry" id="timer_value"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="text" translatable="yes">Fri,Sat 20:00-21:00</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> |
︙ | ︙ | |||
1008 1009 1010 1011 1012 1013 1014 | <child> <object class="GtkEntry" id="config_play_audio_aac"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> | < < < < | 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 | <child> <object class="GtkEntry" id="config_play_audio_aac"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> </packing> </child> <child> <object class="GtkEntry" id="config_play_audio_x_pn_realaudio"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> </packing> </child> <child> <object class="GtkEntry" id="config_play_audio__"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> </packing> </child> <child> <object class="GtkEntry" id="config_play____"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">6</property> |
︙ | ︙ | |||
1110 1111 1112 1113 1114 1115 1116 | <child> <object class="GtkEntry" id="config_record____"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> | < | 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 | <child> <object class="GtkEntry" id="config_record____"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">9</property> |
︙ | ︙ | |||
1166 1167 1168 1169 1170 1171 1172 | <child> <object class="GtkEntry" id="config_browser"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> | < < | 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 | <child> <object class="GtkEntry" id="config_browser"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">12</property> <property name="bottom_attach">13</property> </packing> </child> <child> <object class="GtkEntry" id="config_play_audio_mp3"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> |
︙ | ︙ | |||
1213 1214 1215 1216 1217 1218 1219 | <child> <object class="GtkEntry" id="config_play_audio_ogg"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> | < | 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 | <child> <object class="GtkEntry" id="config_play_audio_ogg"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> |
︙ | ︙ | |||
1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkCheckButton" id="config_show_bookmarks"> <property name="label" translatable="yes">show bookmark star for favourites in stream lists</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkCheckButton" id="config_show_bookmarks"> <property name="label" translatable="yes">show bookmark star for favourites in stream lists</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> |
︙ | ︙ | |||
1396 1397 1398 1399 1400 1401 1402 | <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">5</property> <property name="invisible_char">●</property> <property name="width_chars">4</property> <property name="text" translatable="yes">120</property> <property name="shadow_type">out</property> | < | 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 | <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">5</property> <property name="invisible_char">●</property> <property name="width_chars">4</property> <property name="text" translatable="yes">120</property> <property name="shadow_type">out</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> |
︙ | ︙ | |||
1432 1433 1434 1435 1436 1437 1438 | <child> <object class="GtkCheckButton" id="config_retain_deleted"> <property name="label" translatable="yes">retain deleted stations in list</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> | < < < < < | 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 | <child> <object class="GtkCheckButton" id="config_retain_deleted"> <property name="label" translatable="yes">retain deleted stations in list</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> </packing> </child> <child> <object class="GtkCheckButton" id="config_show_favicons"> <property name="label" translatable="yes">display favicons for individual music stations</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="config_load_favicon"> <property name="label" translatable="yes">load favicon for played stations</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> </packing> </child> <child> <object class="GtkCheckButton" id="config_heuristic_bookmark_update"> <property name="label" translatable="yes">update favorites from freshened stream urls</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">6</property> <property name="bottom_attach">7</property> </packing> </child> <child> <object class="GtkCheckButton" id="config_google_homepage"> <property name="label" translatable="yes">google for homepage URL if missing</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">7</property> |
︙ | ︙ | |||
1537 1538 1539 1540 1541 1542 1543 | </packing> </child> <child> <object class="GtkEntry" id="config_channel_order"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> | < | 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 | </packing> </child> <child> <object class="GtkEntry" id="config_channel_order"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> |
︙ | ︙ | |||
1562 1563 1564 1565 1566 1567 1568 | <child> <object class="GtkCheckButton" id="config_auto_save_appstate"> <property name="label" translatable="yes">automatically save window state</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> | < | 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 | <child> <object class="GtkCheckButton" id="config_auto_save_appstate"> <property name="label" translatable="yes">automatically save window state</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">10</property> |
︙ | ︙ | |||
1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Directories</property> </object> <packing> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Directories</property> </object> <packing> |
︙ | ︙ | |||
1831 1832 1833 1834 1835 1836 1837 | <child> <object class="GtkEntry" id="config_tmp"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> | < | 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 | <child> <object class="GtkEntry" id="config_tmp"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> |
︙ | ︙ | |||
1906 1907 1908 1909 1910 1911 1912 | <object class="GtkEntry" id="config_dir"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> <property name="invisible_char">●</property> | < < | 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 | <object class="GtkEntry" id="config_dir"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> </packing> </child> <child> <object class="GtkCheckButton" id="config_reuse_m3u"> <property name="label" translatable="yes">reuse temporary .m3u files</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> |
︙ | ︙ | |||
2242 2243 2244 2245 2246 2247 2248 | <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="width_request">100</property> <property name="height_request">35</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> | < < | 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 | <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="width_request">100</property> <property name="height_request">35</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="config_cancel" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkButton" id="button1"> <property name="label" translatable="yes">save</property> <property name="use_action_appearance">False</property> <property name="width_request">100</property> <property name="height_request">35</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="config_save" swapped="no"/> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> |
︙ | ︙ | |||
2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 | </object> </child> </object> </child> </object> <object class="GtkWindow" id="win_streamedit"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">inspect/edit stream data</property> <property name="window_position">center-on-parent</property> <property name="skip_pager_hint">True</property> <property name="deletable">False</property> | > < | 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 | </object> </child> </object> </child> </object> <object class="GtkWindow" id="win_streamedit"> <property name="can_focus">False</property> <property name="opacity">0.94999999999999996</property> <property name="border_width">5</property> <property name="title" translatable="yes">inspect/edit stream data</property> <property name="window_position">center-on-parent</property> <property name="skip_pager_hint">True</property> <property name="deletable">False</property> <signal name="delete-event" handler="streamedit_cancel" swapped="no"/> <child> <object class="GtkTable" id="table6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">15</property> <property name="n_rows">10</property> |
︙ | ︙ | |||
2490 2491 2492 2493 2494 2495 2496 | <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="width_request">100</property> <property name="height_request">25</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> | < < < | 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 | <property name="label" translatable="yes">cancel</property> <property name="use_action_appearance">False</property> <property name="width_request">100</property> <property name="height_request">25</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="streamedit_cancel" swapped="no"/> </object> <packing> <property name="x">100</property> <property name="y">10</property> </packing> </child> <child> <object class="GtkButton" id="ok1"> <property name="label" translatable="yes">ok</property> <property name="use_action_appearance">False</property> <property name="width_request">100</property> <property name="height_request">25</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Save changes.</property> <signal name="clicked" handler="streamedit_save" swapped="no"/> </object> <packing> <property name="x">210</property> <property name="y">10</property> </packing> </child> <child> <object class="GtkButton" id="streamedit_new"> <property name="label" translatable="yes">new</property> <property name="use_action_appearance">False</property> <property name="width_request">50</property> <property name="height_request">25</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="streamedit_new" swapped="no"/> </object> <packing> <property name="x">5</property> <property name="y">10</property> </packing> </child> |
︙ | ︙ | |||
2629 2630 2631 2632 2633 2634 2635 | <property name="height_request">330</property> <property name="can_focus">False</property> <property name="title" translatable="yes">streamtuner2</property> <property name="default_width">980</property> <property name="default_height">775</property> <property name="icon">/usr/share/pixmaps/streamtuner2.png</property> <property name="icon_name">applications-multimedia</property> | < < < < < | 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 | <property name="height_request">330</property> <property name="can_focus">False</property> <property name="title" translatable="yes">streamtuner2</property> <property name="default_width">980</property> <property name="default_height">775</property> <property name="icon">/usr/share/pixmaps/streamtuner2.png</property> <property name="icon_name">applications-multimedia</property> <signal name="delete-event" handler="gtk_main_quit" swapped="no"/> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox8"> |
︙ | ︙ | |||
2672 2673 2674 2675 2676 2677 2678 | <child> <object class="GtkMenuItem" id="menu_bookmark"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">bookmark</property> <property name="use_underline">True</property> | | | | | > | | < | 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 | <child> <object class="GtkMenuItem" id="menu_bookmark"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">bookmark</property> <property name="use_underline">True</property> <signal name="activate" handler="bookmark" swapped="no"/> <accelerator key="F8" signal="activate"/> <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/> </object> </child> <child> <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> <property name="label">gtk-save-as</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="save_as" swapped="no"/> <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="F2" signal="activate"/> </object> </child> <child> <object class="GtkImageMenuItem" id="gtk-edit"> <property name="label">gtk-edit</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="streamedit_open" swapped="no"/> <accelerator key="Return" signal="activate" modifiers="GDK_MOD1_MASK"/> <accelerator key="space" signal="activate" modifiers="GDK_MOD1_MASK"/> <accelerator key="F3" signal="activate"/> </object> </child> <child> <object class="GtkMenuItem" id="extensions0"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> |
︙ | ︙ | |||
2739 2740 2741 2742 2743 2744 2745 | <object class="GtkImageMenuItem" id="imagemenuitem_quit"> <property name="label">gtk-quit</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> | < > | 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 | <object class="GtkImageMenuItem" id="imagemenuitem_quit"> <property name="label">gtk-quit</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="gtk_main_quit" swapped="no"/> <accelerator key="F4" signal="activate" modifiers="GDK_MOD1_MASK"/> </object> </child> </object> </child> </object> </child> <child> |
︙ | ︙ | |||
2778 2779 2780 2781 2782 2783 2784 | <object class="GtkImageMenuItem" id="menuitem_delete"> <property name="label">gtk-delete</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> | | | < > | 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 | <object class="GtkImageMenuItem" id="menuitem_delete"> <property name="label">gtk-delete</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="delete_entry" swapped="no"/> <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="Delete" signal="activate"/> </object> </child> <child> <object class="GtkImageMenuItem" id="imagemenuitem8"> <property name="label">gtk-find</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="search_open" swapped="no"/> <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separatormenuitem4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> |
︙ | ︙ | |||
2906 2907 2908 2909 2910 2911 2912 | <object class="GtkImageMenuItem" id="menu_settings"> <property name="label">gtk-properties</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> | < > | 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 | <object class="GtkImageMenuItem" id="menu_settings"> <property name="label">gtk-properties</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="menu_properties" swapped="no"/> <accelerator key="F12" signal="activate"/> </object> </child> </object> </child> </object> </child> <child> |
︙ | ︙ | |||
2942 2943 2944 2945 2946 2947 2948 | <child> <object class="GtkMenuItem" id="menuitem_reload"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Reload</property> <property name="use_underline">True</property> | < > | 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 | <child> <object class="GtkMenuItem" id="menuitem_reload"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Reload</property> <property name="use_underline">True</property> <signal name="activate" handler="on_reload_clicked" swapped="no"/> <accelerator key="F5" signal="activate"/> </object> </child> <child> <object class="GtkMenuItem" id="menuitem10favicons"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> |
︙ | ︙ | |||
3056 3057 3058 3059 3060 3061 3062 | <property name="toolbar_style">both</property> <property name="icon_size">6</property> <child> <object class="GtkToolButton" id="play"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> | < < < | 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 | <property name="toolbar_style">both</property> <property name="icon_size">6</property> <child> <object class="GtkToolButton" id="play"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">play</property> <property name="stock_id">gtk-media-play</property> <signal name="clicked" handler="on_play_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> <object class="GtkToolButton" id="record"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">record</property> <property name="stock_id">gtk-media-record</property> <signal name="clicked" handler="on_record_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> <object class="GtkToolButton" id="homepage_stream"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">station</property> <property name="stock_id">gtk-home</property> <signal name="clicked" handler="on_homepage_stream_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> |
︙ | ︙ | |||
3111 3112 3113 3114 3115 3116 3117 | </packing> </child> <child> <object class="GtkToolButton" id="reload"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> | < < | 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 | </packing> </child> <child> <object class="GtkToolButton" id="reload"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">reload</property> <property name="stock_id">gtk-refresh</property> <signal name="clicked" handler="on_reload_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> <child> <object class="GtkToolButton" id="stop"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">stop</property> <property name="stock_id">gtk-cancel</property> <signal name="clicked" handler="on_stop_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> |
︙ | ︙ | |||
3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 | <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> </object> </child> </object> </interface> | > > > > > | 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 | <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> </object> </child> <child internal-child="accessible"> <object class="AtkObject" id="win_streamtuner2-atkobject"> <property name="AtkObject::accessible-name" translatable="yes">streamtuner2</property> </object> </child> </object> </interface> |
Modified help/streamtuner2.1 from [de31364a43] to [ca2f8a1565].
|
| < | 1 2 3 4 5 6 7 | .\" (many thanks to the manpage howto!) .\" .TH streamtuner2 "January 2014" "BSD/Linux" "User Manuals" .SH NAME streamtuner2 \- Browser for internet radio stations .SH SYNOPSIS .B streamtuner2 |
︙ | ︙ | |||
56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | .BI streamtuner2 " stream" " shoutcast,xiph" " ""Top 100""" Searches for the term "Top 100" in the shoutcast and xiph channels, and returns all info about the first match as JSON output. .TP .BI streamtuner2 " play frequence3" Looks for the first occourence, and starts the audio player for FREQUENCE3. .SH FILES .IR /home/ $USER /.config/streamtuner2/settings.json .SH "SEE ALSO" .BR streamripper (1) .BR audacious (1) .BR json (5) .BR m3u (5) .BR pls (5) | > > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | .BI streamtuner2 " stream" " shoutcast,xiph" " ""Top 100""" Searches for the term "Top 100" in the shoutcast and xiph channels, and returns all info about the first match as JSON output. .TP .BI streamtuner2 " play frequence3" Looks for the first occourence, and starts the audio player for FREQUENCE3. .SH GRAPHICAL MODE There's only one option for the graphical UI mode: .TP .BI --gtk3 Loads Gtk3 via PyGI instead of Gtk2. This is implicit when running on Python3 anyway. .SH FILES .IR /home/ $USER /.config/streamtuner2/settings.json .SH "SEE ALSO" .BR streamripper (1) .BR audacious (1) .BR json (5) .BR m3u (5) .BR pls (5) |
Deleted http.py version [0d4dcfee94].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified kronos.py from [6ae12b7565] to [24a87e43ef].
︙ | ︙ | |||
270 271 272 273 274 275 276 | self.sched.queue[:] = [] def _run(self): # Low-level run method to do the actual scheduling loop. while self.running: try: self.sched.run() | | | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | self.sched.queue[:] = [] def _run(self): # Low-level run method to do the actual scheduling loop. while self.running: try: self.sched.run() except Exception as x: print >>sys.stderr, "ERROR DURING SCHEDULER EXECUTION",x print >>sys.stderr, "".join( traceback.format_exception(*sys.exc_info())) print >>sys.stderr, "-" * 20 # queue is empty; sleep a short while before checking again if self.running: time.sleep(5) |
︙ | ︙ | |||
294 295 296 297 298 299 300 | self.args=args self.kw=kw def __call__(self, schedulerref): """Execute the task action in the scheduler's thread.""" try: self.execute() | | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | self.args=args self.kw=kw def __call__(self, schedulerref): """Execute the task action in the scheduler's thread.""" try: self.execute() except Exception as x: self.handle_exception(x) self.reschedule(schedulerref()) def reschedule(self, scheduler): """This method should be defined in one of the sub classes!""" raise NotImplementedError("You're using the abstract base class 'Task'," " use a concrete class instead") |
︙ | ︙ | |||
462 463 464 465 466 467 468 | self.reschedule(schedulerref()) def threadedcall(self): # This method is run within its own thread, so we have to # do the execute() call and exception handling here. try: self.execute() | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | self.reschedule(schedulerref()) def threadedcall(self): # This method is run within its own thread, so we have to # do the execute() call and exception handling here. try: self.execute() except Exception as x: self.handle_exception(x) class ThreadedIntervalTask(ThreadedTaskMixin, IntervalTask): """Interval Task that executes in its own thread.""" pass class ThreadedSingleTask(ThreadedTaskMixin, SingleTask): |
︙ | ︙ | |||
529 530 531 532 533 534 535 | def __call__(self, schedulerref): """Execute the task action in its own process.""" pid = os.fork() if pid == 0: # we are the child try: self.execute() | | | 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | def __call__(self, schedulerref): """Execute the task action in its own process.""" pid = os.fork() if pid == 0: # we are the child try: self.execute() except Exception as x: self.handle_exception(x) os._exit(0) else: # we are the parent self.reschedule(schedulerref()) |
︙ | ︙ |
Modified mygtk.py from [98fa2cab88] to [2fdc371b2a].
1 2 3 4 5 6 | # # encoding: UTF-8 # api: python # type: functions # title: mygtk helper functions # description: simplify usage of some gtk widgets | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | # # encoding: UTF-8 # api: python # type: functions # title: mygtk helper functions # description: simplify usage of some gtk widgets # version: 1.7 # author: mario # license: public domain # # # Wrappers around gtk methods. The TreeView method .columns() allows # to fill a treeview. It adds columns and data rows with a mapping # dictionary (which specifies many options and data positions). |
︙ | ︙ | |||
25 26 27 28 29 30 31 32 | # debug from config import __print__, dbg | > > > > > > > > > > > > | < | > | | < > | < < < < < < < < | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | # debug from config import __print__, dbg # filesystem import os.path import copy import sys from compat2and3 import unicode, xrange, PY3 # gtk version (2=gtk2, 3=gtk3) ver = 2 # if running on Python3 or with commandline flag if PY3 or "--gtk3" in sys.argv: ver = 3 # load gtk modules if ver==3: from gi import pygtkcompat as pygtk pygtk.enable() pygtk.enable_gtk(version='3.0') from gi.repository import Gtk as gtk from gi.repository import GObject as gobject from gi.repository import GdkPixbuf ui_file = "gtk3.xml" empty_pixbuf = GdkPixbuf.Pixbuf.new_from_data(b"\0\0\0\0", GdkPixbuf.Colorspace.RGB, True, 8, 1, 1, 4, None, None) __print__(dbg.PROC, gtk) __print__(dbg.PROC, gobject) else: import pygtk import gtk import gobject ui_file = "gtk2.xml" empty_pixbuf = gtk.gdk.pixbuf_new_from_data(b"\0\0\0\0",gtk.gdk.COLORSPACE_RGB,True,8,1,1,4) # simplified gtk constructors --------------------------------------------- class mygtk: |
︙ | ︙ | |||
122 123 124 125 126 127 128 | rend = gtk.CellRendererText() # text cell cell[3]["text"] = datapos #col.set_sort_column_id(datapos) # only on textual cells # attach cell to column col.pack_end(rend, expand=cell[3].get("expand",True)) # apply attributes | | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | rend = gtk.CellRendererText() # text cell cell[3]["text"] = datapos #col.set_sort_column_id(datapos) # only on textual cells # attach cell to column col.pack_end(rend, expand=cell[3].get("expand",True)) # apply attributes for attr,val in list(cell[3].items()): col.add_attribute(rend, attr, val) # next datapos += 1 __print__(dbg.INFO, cell, len(cell)) # add column to treeview widget.append_column(col) # finalize widget widget.set_search_column(5) #?? widget.set_search_column(4) #?? widget.set_search_column(3) #?? widget.set_search_column(2) #?? |
︙ | ︙ | |||
150 151 152 153 154 155 156 | if (not rowmap): for desc in datamap: for var in xrange(2, len(desc)): vartypes.append(desc[var][1]) # content types rowmap.append(desc[var][0]) # dict{} column keys in entries[] list # create gtk array storage ls = gtk.ListStore(*vartypes) # could be a TreeStore, too | | | | > > > > > > > | > | | | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | if (not rowmap): for desc in datamap: for var in xrange(2, len(desc)): vartypes.append(desc[var][1]) # content types rowmap.append(desc[var][0]) # dict{} column keys in entries[] list # create gtk array storage ls = gtk.ListStore(*vartypes) # could be a TreeStore, too __print__(dbg.UI, vartypes, len(vartypes)) __print__(dbg.DATA, rowmap, len(rowmap)) # prepare for missing values, and special variable types defaults = { str: "", unicode: "", bool: False, int: 0, gtk.gdk.Pixbuf: empty_pixbuf } if gtk.gdk.Pixbuf in vartypes: pix_entry = vartypes.index(gtk.gdk.Pixbuf) # sort data into gtk liststore array for row in entries: # preset some values if absent row.setdefault("deleted", False) row.setdefault("search_col", "#ffffff") row.setdefault("search_set", False) # generate ordered list from dictionary, using rowmap association row = [ row.get( skey , defaults[vartypes[i]] ) for i,skey in enumerate(rowmap) ] # map Python2 unicode to str row = [ str(value) if type(value) is unicode else value for value in row ] # autotransform string -> gtk image object if (pix_entry and type(row[pix_entry]) == str): row[pix_entry] = ( gtk.gdk.pixbuf_new_from_file(row[pix_entry]) if os.path.exists(row[pix_entry]) else defaults[gtk.gdk.Pixbuf] ) try: # add ls.append(row) # had to be adapted for real TreeStore (would require additional input for grouping/level/parents) except: # brute-force typecast ls.append( [va if ty==gtk.gdk.Pixbuf else ty(va) for va,ty in zip(row,vartypes)] ) __print__("[37m→[0m", row, len(row)) # apply array to widget widget.set_model(ls) return ls pass #-- treeview for categories # # simple two-level treeview display in one column # with entries = [main,[sub,sub], title,[...],...] # @staticmethod def tree(widget, entries, title="category", icon=gtk.STOCK_DIRECTORY): # list types ls = gtk.TreeStore(str, str) print(entries) # add entries for entry in entries: if isinstance(entry, (str,unicode)): main = ls.append(None, [str(entry), icon]) else: for sub_title in entry: ls.append(main, [str(sub_title), icon]) # just one column tvcolumn = gtk.TreeViewColumn(title); widget.append_column(tvcolumn) # inner display: icon & string pix = gtk.CellRendererPixbuf() |
︙ | ︙ | |||
298 299 300 301 302 303 304 | @staticmethod def app_restore(wTree, r=None): for wn in r.keys(): # widgetnames w = wTree.get_widget(wn) if (not w): continue t = type(w) | | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | @staticmethod def app_restore(wTree, r=None): for wn in r.keys(): # widgetnames w = wTree.get_widget(wn) if (not w): continue t = type(w) for method,args in r[wn].items(): # gtk.Window if method == "size": w.resize(args[0], args[1]) # gtk.TreeView if method == "columns:width": for i,col in enumerate(w.get_columns()): if (i < len(args)): |
︙ | ︙ |
Modified pq.py from [774d8a07cf] to [9ad9a3d426].
︙ | ︙ | |||
15 16 17 18 19 20 21 | try: from pyquery import PyQuery as pq # pq.each_pq = lambda self,func: self.each( lambda i,html: func( pq(html, parser="html") ) ) | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | try: from pyquery import PyQuery as pq # pq.each_pq = lambda self,func: self.each( lambda i,html: func( pq(html, parser="html") ) ) except Exception as e: # disable use pq = None config.conf.pyquery = False # error hint print("LXML is missing\n", e) |
︙ | ︙ |
Modified pson.py from [759da668d2] to [6186b9e864].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 | # This module provides the JSON api. If the python 2.6 module # isn't available, it provides an emulation using str() and # eval() and Python notation. (The representations are close.) # # Additionally it filters out any left-over objects. Sometimes # pygtk-objects crawled into the streams[] lists, because rows # might have been queried from the widgets. # #-- reading and writing json (for the config module) ---------------------------------- import sys | > > > > > < | < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | # This module provides the JSON api. If the python 2.6 module # isn't available, it provides an emulation using str() and # eval() and Python notation. (The representations are close.) # # Additionally it filters out any left-over objects. Sometimes # pygtk-objects crawled into the streams[] lists, because rows # might have been queried from the widgets. # (Need to find out if that still happens..) # # filter_data should become redundant, as mygtk.columns now # converts unicode to str in Py2. And since we depend on Py2.7 # anway the JSON-like Python serialization should be dropped. # #-- reading and writing json (for the config module) ---------------------------------- import sys from compat2and3 import unicode # try to load the system module first try: from json import dump as json_dump, load as json_load except: print("no native Python JSON module") |
︙ | ︙ | |||
59 60 61 62 63 64 65 | # load from filepointer, decode string into dicts/list def load(fp): try: #print("try json") r = json_load(fp) | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | # load from filepointer, decode string into dicts/list def load(fp): try: #print("try json") r = json_load(fp) # r = filter_data(r) # turn unicode() strings back into str() - pygtk does not accept u"strings" except: #print("fall back on pson") fp.seek(0) r = eval(fp.read(1<<27)) # max 128 MB # print("fake json module: in python variable dump notation") if r == None: |
︙ | ︙ |
Modified st2.py from [0b9e0b6b81] to [858158ce9f].
1 2 3 4 5 6 7 | #!/usr/bin/env python # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: directory browser for internet radio / audio streams # depends: gtk, pygtk, xml.dom.minidom, threading, lxml, pyquery, kronos | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | #!/usr/bin/env python # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: directory browser for internet radio / audio streams # depends: gtk, pygtk, xml.dom.minidom, threading, lxml, pyquery, kronos # version: 2.0.9.7 # author: mario salzer # license: public domain # url: http://freshmeat.net/projects/streamtuner2 # config: <env name="http_proxy" value="" description="proxy for HTTP access" /> <env name="XDG_CONFIG_HOME" description="relocates user .config subdirectory" /> # category: multimedia # # |
︙ | ︙ | |||
76 77 78 79 80 81 82 | # standard modules import sys import os, os.path import re | < < | | | < | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | # standard modules import sys import os, os.path import re # threading or processing module try: from processing import Process as Thread except: from threading import Thread Thread.stop = lambda self: None # add library path sys.path.insert(0, "/usr/share/streamtuner2") # pre-defined directory for modules sys.path.insert(0, ".") # development module path # gtk modules from mygtk import pygtk, gtk, gobject, ui_file, mygtk, ver as GTK_VER # custom modules from config import conf # initializes itself, so all conf.vars are available right away from config import __print__, dbg import ahttp import action # needs workaround... (action.main=main) from channels import * import favicon # this represents the main window # and also contains most application behaviour main = None class StreamTunerTwo(gtk.Builder): |
︙ | ︙ | |||
166 167 168 169 170 171 172 | self.current_channel = self.current_channel_gtk() try: self.channel().first_show() except: __print__(dbg.INIT, "main.__init__: current_channel.first_show() initialization error") # bind gtk/glade event names to functions gui_startup(19/20.0) | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | self.current_channel = self.current_channel_gtk() try: self.channel().first_show() except: __print__(dbg.INIT, "main.__init__: current_channel.first_show() initialization error") # bind gtk/glade event names to functions gui_startup(19/20.0) self.connect_signals(dict( list({ "gtk_main_quit" : self.gtk_main_quit, # close window # treeviews / notebook "on_stream_row_activated" : self.on_play_clicked, # double click in a streams list "on_category_clicked": self.on_category_clicked, # new selection in category list "on_notebook_channels_switch_page": self.channel_switch, # channel notebook tab changed "station_context_menu": lambda tv,ev: station_context_menu(tv,ev), # toolbar |
︙ | ︙ | |||
216 217 218 219 220 221 222 | "search_google": search.google, "search_cancel": search.cancel, "true": lambda w,*args: True, "streamedit_open": streamedit.open, "streamedit_save": streamedit.save, "streamedit_new": streamedit.new, "streamedit_cancel": streamedit.cancel, | | | | | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | "search_google": search.google, "search_cancel": search.cancel, "true": lambda w,*args: True, "streamedit_open": streamedit.open, "streamedit_save": streamedit.save, "streamedit_new": streamedit.new, "streamedit_cancel": streamedit.cancel, }.items() ) + list( self.add_signals.items() ) )) # actually display main window gui_startup(99/100.0) self.win_streamtuner2.show() # WHY DON'T YOU WANT TO WORK?! #self.shoutcast.gtk_list.set_enable_search(True) #self.shoutcast.gtk_list.set_search_column(4) #-- Shortcut for glade.get_widget() # Allows access to widgets as direct attributes instead of using .get_widget() # Also looks in self.channels[] for the named channel plugins def __getattr__(self, name): if (name in self.channels): return self.channels[name] # like self.shoutcast else: return self.get_object(name) # or gives an error if neither exists # custom-named widgets are available from .widgets{} not via .get_widget() def get_widget(self, name): if name in self.widgets: return self.widgets[name] else: return gtk.Builder.get_object(self, name) |
︙ | ︙ | |||
521 522 523 524 525 526 527 | gtk.rc_parse(f) pass # end application and gtk+ main loop def gtk_main_quit(self, widget, *x): if conf.auto_save_appstate: | > | > > | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | gtk.rc_parse(f) pass # end application and gtk+ main loop def gtk_main_quit(self, widget, *x): if conf.auto_save_appstate: try: # doesn't work with gtk3 yet (probably just hooking at the wrong time) self.app_state(widget) except: None gtk.main_quit() |
︙ | ︙ | |||
556 557 558 559 560 561 562 | # right click in streams/stations TreeView def station_context_menu(treeview, event): # right-click ? if event.button >= 3: path = treeview.get_path_at_pos(int(event.x), int(event.y))[0] treeview.grab_focus() treeview.set_cursor(path, None, False) | | > > > > | | | 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 | # right click in streams/stations TreeView def station_context_menu(treeview, event): # right-click ? if event.button >= 3: path = treeview.get_path_at_pos(int(event.x), int(event.y))[0] treeview.grab_focus() treeview.set_cursor(path, None, False) main.streamactions.popup( parent_menu_shell=None, parent_menu_item=None, func=None, button=event.button, activate_time=event.time, data=None ) return None # we need to pass on to normal left-button signal handler else: return False # this works better as callback function than as class - because of False/Object result for event trigger # encapsulates references to gtk objects AND properties in main window class auxiliary_window(object): def __getattr__(self, name): if name in main.__dict__: return main.__dict__[name] elif name in StreamTunerTwo.__dict__: return StreamTunerTwo.__dict__[name] else: return main.get_widget(name) """ allows to use self. and main. almost interchangably """ |
︙ | ︙ | |||
768 769 770 771 772 773 774 | def hide(self, *args): self.win_config.hide() return True # set/load values between gtk window and conf. dict def apply(self, config, prefix="config_", save=0): | | | 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 | def hide(self, *args): self.win_config.hide() return True # set/load values between gtk window and conf. dict def apply(self, config, prefix="config_", save=0): for key,val in config.items(): # map non-alphanumeric chars from config{} to underscores in according gtk widget names id = re.sub("[^\w]", "_", key) w = main.get_widget(prefix + id) __print__(dbg.CONF, "config", ("save" if save else "load"), prefix+id, w, val) # recurse into dictionaries, transform: conf.play.audio/mp3 => conf.play_audio_mp3 if (type(val) == dict): self.apply(val, prefix + id + "_", save) |
︙ | ︙ | |||
824 825 826 827 828 829 830 | # add configuration setting definitions from plugins once = 0 def add_plugins(self): if self.once: return | | | 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 | # add configuration setting definitions from plugins once = 0 def add_plugins(self): if self.once: return for name,enabled in conf.plugins.items(): # add plugin load entry if name: label = ("enable ⎗ %s channel" if self.channels.get(name) else "use ⎗ %s plugin") cb = gtk.ToggleButton(label=label % name) self.add_( "config_plugins_"+name, cb )#, label=None, color="#ddd" ) |
︙ | ︙ | |||
1043 1044 1045 1046 1047 1048 1049 | # First we'll generate a list of current bookmark stream urls, and then # remove all but those from the currently UPDATED_channel + category. # This step is most likely redundant, but prevents accidently re-rewriting # stations that are in two channels (=duplicates with different PLS urls). check = {"http//": "[row]"} check = dict((row["url"],row) for row in fav) # walk through all channels/streams | | | | 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 | # First we'll generate a list of current bookmark stream urls, and then # remove all but those from the currently UPDATED_channel + category. # This step is most likely redundant, but prevents accidently re-rewriting # stations that are in two channels (=duplicates with different PLS urls). check = {"http//": "[row]"} check = dict((row["url"],row) for row in fav) # walk through all channels/streams for chname,channel in main.channels.items(): for cat,streams in channel.streams.items(): # keep the potentially changed rows if (chname == updated_channel) and (cat == updated_category): freshened_streams = streams # remove unchanged urls/rows else: |
︙ | ︙ | |||
1149 1150 1151 1152 1153 1154 1155 | #-- run main --------------------------------------------- if __name__ == "__main__": #-- global configuration settings "conf = Config()" # already happened with "from config import conf" # graphical | | | | 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 | #-- run main --------------------------------------------- if __name__ == "__main__": #-- global configuration settings "conf = Config()" # already happened with "from config import conf" # graphical if len(sys.argv) < 2 or "--gtk3" in sys.argv: # prepare for threading in Gtk+ callbacks gobject.threads_init() gui_startup(1/100.0) # prepare main window main = StreamTunerTwo() # module coupling action.main = main # action (play/record) module needs a reference to main window for gtk interaction and some URL/URI callbacks action = action.action # shorter name ahttp.feedback = main.status # http module gives status feedbacks too # first invocation if (conf.get("firstrun")): config_dialog.open(None) del conf.firstrun |
︙ | ︙ |