Check-in [f0cd5d48f2]
Overview
Comment: | live365 now searches javascript |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f0cd5d48f2dbbd736673913d2926554f |
User & Date: | mario on 2014-01-04 22:25:31 |
Other Links: | manifest | tags |
Context
2014-01-04
| ||
22:37 | Live365 fixed by Abhisek Sanyal check-in: 0cf2739b13 user: mario tags: trunk | |
22:25 | live365 now searches javascript check-in: f0cd5d48f2 user: mario tags: trunk | |
2012-01-12
| ||
14:39 | (no comment) check-in: ff3473b8ec user: mario tags: trunk | |
Changes
Modified README from [7a93008fc3] to [2b90d3c380].
︙ | ︙ | |||
102 103 104 105 106 107 108 | - added [new] button in streamedit window - prepared remaining print syntax for python3 (still needs 2to3 though) - fix for https://bugzilla.redhat.com/show_bug.cgi?id=655596 array error - transitioned glade file to gtk.Builder, just a few things broke - made configuration window resizable - locked station list columns, no longer resortable (associatation mismatch) - applied Vincents fixed for Windows action.run and Shoutcast PQ parsing | | | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | - added [new] button in streamedit window - prepared remaining print syntax for python3 (still needs 2to3 though) - fix for https://bugzilla.redhat.com/show_bug.cgi?id=655596 array error - transitioned glade file to gtk.Builder, just a few things broke - made configuration window resizable - locked station list columns, no longer resortable (associatation mismatch) - applied Vincents fixed for Windows action.run and Shoutcast PQ parsing - reading of live365 restored, but no .pls location so far 2.0.8 - configuration files use prettified json - fixed double quotation for %pls players and /local/file handling - (unused) channel .shutdown function introduced (late saving) - external plugin: basic file browser, no ID3 editing yet |
︙ | ︙ |
Modified _pack from [71637bf944] to [b488883eba].
|
| < < > > > > > > > > > | | > > | | > > | | > | | > > > > | > < < < < < < < < < | 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 | #-- meta data VERSION=$(get_version st2.py) epm_set_version _package.epm $VERSION perl -n -i -e 'if (/^(\s+a.set_version)[\d.(\")]+/m) { print "$1(\"'$VERSION'\")\n" } else { print }' st2.py echo "------------------ source .txz ------------------" cd .. pax -wvJf streamtuner2-$VERSION.src.txz \ streamtuner2/*.py streamtuner2/*.xml streamtuner2/channels/*.{py,png} \ streamtuner2/*.png streamtuner2/*.svg streamtuner2/*.desktop \ streamtuner2/README streamtuner2/help/* streamtuner2/contrib/* \ streamtuner2/PKG-INFO streamtuner2/version streamtuner2/_pack streamtuner2/*.epm # streamtuner2/scripts cd - echo "-------------------- .deb -----------------------" fakeroot epm -vvv -n -a all -f deb DEP=deb streamtuner2 _package.epm echo "------------------ slackware --------------------" epm -vvv -n -a all -f slackware streamtuner2 _package.epm echo "-------------- .tar.gz installer ---------------" epm -vvv -n -a all -f portable -s streamtuner2.png streamtuner2 _package.epm echo "-------------------- .rpm -----------------------" epm -vvv -n -a all -f rpm streamtuner2 _package.epm /usr/bin/rpmbuild -bb --buildroot "/home/mario/projects/streamtuner2/linux-3.0-all/buildroot" --target all linux-3.0-all/streamtuner2.spec mv linux-3.0-all/RPMS/all/*.rpm linux-3.0-all echo "-------------------- win32 -----------------------" for pkg in "win32" do epm-win32sfx -v streamtuner2 _package.epm done |
Modified _package.epm from [bb299e0003] to [0d8e7f10fb].
1 | %product streamtuner2 - internet radio browser | | | < | | | | 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 | %product streamtuner2 - internet radio browser %version 2.0.9 %vendor Mario Salzer %license %copyright Placed into the Public Domain, 2009-2014 %readme README %description Browser for Internet Radio Stations %description . %description streamtuner2 is a browser for radio station directories. %description It can fetch lists from SHOUTcast, Xiph.org, Live365, %description Jamendo, DMOZ, basic.ch, Punkcast. And it lists stream %description entries by category or genre. It reuses existing audio %description players, and recording is delegated to streamripper. %description . %description It mimics the original streamtuner 0.99.99, but is easier %description to extend because it's written entirely in Python. It's %description already in a stable and useable form. %description . %description There is no license to accept. Streamtuner2 is open source %description and released into the Public Domain. %system all #-- base f 644 root root /usr/share/doc/streamtuner2/README ./README |
︙ | ︙ |
Modified channels/live365.py from [0058898af0] to [f126b8da6a].
1 2 3 4 5 6 7 | # streamtuner2 modules from config import conf | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | # # api: streamtuner2 # title: live365 # state: deprecated # # Live365 probably won't be made working anymore. Too many Javascript+XML blobs. # Pretty cumbersome/sluggish to use the actual website nowadays. # # streamtuner2 modules from config import conf |
︙ | ︙ | |||
54 55 56 57 58 59 60 | # superclass ChannelPlugin.__init__(self, parent) # read category thread from /listen/browse.live def update_categories(self): | < | < < < < < < < < < < < < < < < < < < < < < < < < < | | | < < | > > | < < | > > | > > > | < | > > > | < < < < | > | > | | < < < < < | < > > > | < > > | 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 | # superclass ChannelPlugin.__init__(self, parent) # read category thread from /listen/browse.live def update_categories(self): return # extract stream infos def update_streams(self, cat, search=""): # search / url if (not search): url = "http://www.live365.com/genres/" + self.cat2tag(cat) else: url = "http://www.live365.com/cgi-bin/directory.cgi?mode=2&site=web&searchdesc=" + urllib.quote(search) html = http.get(url, feedback=self.parent.status) # we only need to download one page, because live365 always only gives 200 results # extract JS calls rx = re.compile(r""" new\s+top\.Station; \s+ stn.set\("stationName", \s+ "(\w+)"\); \s+ stn.set\("title", \s+ "([^"]+)"\); \s+ stn.set\("id", \s+ "(\d+)"\); \s+ stn.set\("listenerAccess", \s+ "(\w+)"\); \s+ stn.set\("status", \s+ "(\w+)"\); \s+ stn.set\("serverMode", \s+ "(\w+)"\); \s+ stn.set\("rating", \s+ "(\d+)"\); \s+ stn.set\("ratingCount", \s+ "(\d+)"\); \s+ stn.set\("tlh", \s+ "(\d+)"\); \s+ stn.set\("imgUrl", \s+ "([^"]+)"\); \s+ stn.set\("location", \s+ "([^"]+)"\); """, re.X|re.I|re.S|re.M) #('jtava', 'ANRLIVE.NET', '293643', 'PUBLIC', 'OK', 'OR', '298', '31', #'98027', 'http://www.live365.com/userdata/37/15/1371537/stationlogo80x45.jpg', 'n/a') # append entries to result list __print__( html ) ls = [] for row in rx.findall(html): __print__( row ) ls.append({ "launch_id": row[0], "title": entity_decode(row[1]), "station_id": row[2], "sofo": row[3], "state": ("" if row[4]=="OK" else gtk.STOCK_STOP), "rating": int(row[6]), "listeners": int(row[8]), "img_": row[9], "description": entity_decode(row[10]), "max": 0, "genre": cat, "bitrate": 128, "playing": "", "url": "http://www.live365.com/cgi-bin/mini.cgi?version=3&templateid=xml&from=web&site=web&caller=&tag=web&station_name="+row[0]+"&_=1388870321828", "format": "application/xml", }) return ls # faster if we do it in _update() prematurely #def prepare(self, ls): # GenericChannel.prepare(ls) # for row in ls: |
︙ | ︙ |
Modified st2.py from [c1d417a2d9] to [2dd481062a].
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 # 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 # # |
︙ | ︙ | |||
27 28 29 30 31 32 33 | # # # """ project status """ # | < | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | # # # """ project status """ # # The application runs mostly stable. The GUI interfaces are workable. # There haven't been any optimizations regarding memory usage and # performance. The current internal API is acceptable. Documentation is # coming up. # # current bugs: # - audio- and list-format support is not very robust / needs better API # - lots of GtkWarning messages |
︙ | ︙ | |||
519 520 521 522 523 524 525 | # auxiliary window: about dialog class AboutStreamtuner2: # about us def __init__(self): a = gtk.AboutDialog() | | | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 | # auxiliary window: about dialog class AboutStreamtuner2: # about us def __init__(self): a = gtk.AboutDialog() a.set_version("2.0.9") a.set_name("streamtuner2") a.set_license("Public Domain\n\nNo Strings Attached.\nUnrestricted distribution,\nmodification, use.") a.set_authors(["Mario Salzer <http://mario.include-once.org/>\n\nConcept based on streamtuner 0.99.99 from\nJean-Yves Lefort, of which some code remains\nin the Google stations plugin.\n<http://www.nongnu.org/streamtuner/>\n\nMyOggRadio plugin based on cooperation\nwith Christian Ehm. <http://ehm-edv.de/>"]) a.set_website("http://milki.include-once.org/streamtuner2/") a.connect("response", lambda a, ok: ( a.hide(), a.destroy() ) ) a.show() |
︙ | ︙ |