Check-in [2590478319]
Overview
Comment: | Fetch all 5 available pages from Xiph directory. Rewrite to use more directed regex extraction mode. Minor help page updates. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
25904783193e3a41c8c7d30d4e96e2c4 |
User & Date: | mario on 2015-05-19 22:37:03 |
Other Links: | manifest | tags |
Context
2015-05-19
| ||
22:37 | Minor help page updates. check-in: 9b6aa021cd user: mario tags: trunk | |
22:37 | Fetch all 5 available pages from Xiph directory. Rewrite to use more directed regex extraction mode. Minor help page updates. check-in: 2590478319 user: mario tags: trunk | |
2015-05-18
| ||
22:21 | A bit more PEP8, without undoing all readability. check-in: 492cb2aacf user: mario tags: trunk | |
Changes
Modified Makefile from [75ad58880f] to [14bf4a5119].
︙ | |||
82 83 84 85 86 87 88 | 82 83 84 85 86 87 88 89 90 | + + | $(INST) help/str*2.1 -t /usr/share/man/man1/ # start locally st2: run run: MALLOC_CHECK_=2 PYTHONVERBOSE=2 python -B ./st2.py -D yelp: yelp help/index.page 2>/dev/null & |
Modified channels/xiph.py from [6ec5e242b7] to [c7435085e0].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | - + | # encoding: UTF-8 # api: streamtuner2 # title: Xiph.org # description: ICEcast radios. Scans per JSON API, slow XML, or raw directory. # type: channel # url: http://dir.xiph.org/ |
︙ | |||
191 192 193 194 195 196 197 | 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 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | - + + - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - + + + + + + + + + + + + + + | elif by_format.get(cat): url = "http://dir.xiph.org/by_format/{}".format(by_format[cat]) elif cat: url = "http://dir.xiph.org/by_genre/{}".format(cat.title()) # Collect all result pages html = ahttp.get(url) |
︙ |
Modified help/html/channels.html from [8205a3a87a] to [d55074ef89].
︙ | |||
46 47 48 49 50 51 52 | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | - | <div class="linkdiv "><a class="linkdiv" href="surfmusik.html" title="SurfMusic"><span class="title">SurfMusic</span><span class="linkdiv-dash"> โ </span><span class="desc">International radio listings.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="modarchive.html" title="The MOD Archive"><span class="title">The MOD Archive</span><span class="linkdiv-dash"> โ </span><span class="desc">Tracker audio file collection.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="tunein.html" title="TuneIn"><span class="title">TuneIn</span><span class="linkdiv-dash"> โ </span><span class="desc">Radio and Podcast directory.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="ubuntuusersm.html" title="UbuntuUsers"><span class="title">UbuntuUsers</span><span class="linkdiv-dash"> โ </span><span class="desc">Wiki list of radio stations</span></a></div> <div class="linkdiv "><a class="linkdiv" href="xiph.html" title="Xiph.org"><span class="title">Xiph.org</span><span class="linkdiv-dash"> โ </span><span class="desc">ICEcast radio directory.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="youtube.html" title="Youtube"><span class="title">Youtube</span><span class="linkdiv-dash"> โ </span><span class="desc">Youtube music/video listings.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="filtermusic.html" title="filtermusic"><span class="title">filtermusic</span><span class="linkdiv-dash"> โ </span><span class="desc">Selection of the best radio stations</span></a></div> |
︙ |
Modified help/html/configuration.html from [1a042d5b7d] to [390f4e28ed].
︙ | |||
14 15 16 17 18 19 20 | 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 | - + - + - - - + + - + - - + + | <div class="region"> <div class="contents"> <p class="p"> There are various options for streamtuner2, available under <span class="guiseq"><span class="gui">Edit</span>ย โธ <span class="gui">Preferences</span></span> or via <span class="key"><kbd>F12</kbd></span>. </p> <p class="p"><span class="media"><span class="media media-image"><img src="img/configtabs.png" class="media media-inline" alt=""></span></span></p> <div class="terms"><div class="inner"> |
︙ | |||
100 101 102 103 104 105 106 | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | - + - | </tr> <tr class="shade"> <td style="border-top-style: solid;"><p class="p"><span class="var">video/youtube</span></p></td> <td style="border-top-style: solid;border-left-style: solid;"><p class="p"><span class="cmd">xterm -e "youtube-dl %srv"</span></p></td> </tr> </table></div></div></div> <p class="p">To define a target directory, you can often add commandline arguments to each. Also it's typically |
︙ | |||
136 137 138 139 140 141 142 | 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 | - + + + + + | <dt class="terms">Prefer HTML traversing (PyQuery) over regex</dt> <dd class="terms"><p class="p">Some channels provide proper APIs to fetch station lists. Others are just websites that require scraping listings out. Most channel tabs provide two alternative methods for that. The DOM/HTML selection method is sometimes slower, but more reliable. As fallback streamtuner2 plugins often use a regex to match text. Occassionally the regex method is surprisingly more exact, because directory services often use frightful unstructured HTML. If available, both methods are tried. You can influence the order with this setting, and thus speed it up.</p></dd> |
︙ |
Modified help/html/dirble.html from [eb6889438c] to [679737f4dc].
︙ | |||
23 24 25 26 27 28 29 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | - + | <p class="p">Dirble.com is another radio station directory, made up of user-contributed content, and automatic streaming server polling.</p> <p class="p">It provides a JSON API, which as of v2 has a lot of unneeded meta information and internal ids. But it's actually nicer to scan, and contains even station homepages now.</p> <div class="note" title="Note"><div class="inner"><div class="region"><div class="contents"><p class="p">The config option for a custom API key is perhaps redundant. Should streamtuner2 -D however reveal an error, you |
︙ |
Modified help/html/dragndrop.html from [3bc0a5d01f] to [c6fcc988d0].
︙ | |||
22 23 24 25 26 27 28 | 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 | - + - + - + - + | stream entry, then drag it out to the desktop, file manager or directly into VLC or any running music player. That'll usually copy a stream/station address directly.</p> <p class="p">Now it's not guaranteed to work with all applications or file managers, as X11/Gtk DND support is somewhat arcane and wonky. You may specifically have to adapt the default export format for this. Generally a XSPF or PLS file gets created for file managers. |
︙ |
Modified help/html/index.html from [fdcf65fb91] to [00b071231d].
︙ | |||
43 44 45 46 47 48 49 | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | - | <div class="linkdiv "><a class="linkdiv" href="surfmusik.html" title="SurfMusic"><span class="title">SurfMusic</span><span class="linkdiv-dash"> โ </span><span class="desc">International radio listings.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="modarchive.html" title="The MOD Archive"><span class="title">The MOD Archive</span><span class="linkdiv-dash"> โ </span><span class="desc">Tracker audio file collection.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="tunein.html" title="TuneIn"><span class="title">TuneIn</span><span class="linkdiv-dash"> โ </span><span class="desc">Radio and Podcast directory.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="ubuntuusersm.html" title="UbuntuUsers"><span class="title">UbuntuUsers</span><span class="linkdiv-dash"> โ </span><span class="desc">Wiki list of radio stations</span></a></div> <div class="linkdiv "><a class="linkdiv" href="xiph.html" title="Xiph.org"><span class="title">Xiph.org</span><span class="linkdiv-dash"> โ </span><span class="desc">ICEcast radio directory.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="youtube.html" title="Youtube"><span class="title">Youtube</span><span class="linkdiv-dash"> โ </span><span class="desc">Youtube music/video listings.</span></a></div> <div class="linkdiv "><a class="linkdiv" href="filtermusic.html" title="filtermusic"><span class="title">filtermusic</span><span class="linkdiv-dash"> โ </span><span class="desc">Selection of the best radio stations</span></a></div> |
︙ |
Modified help/html/recording.html from [ff6bd6ba77] to [373c27967f].
︙ | |||
54 55 56 57 58 59 60 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | - + + + | <div class="list"><div class="inner"><div class="region"><ul class="list"><li class="list"><p class="p"><span class="cmd">xterm -e "streamripper -A -s 3600 -d ~/Music/ %srv"</span></p></li></ul></div></div></div> </li> <li class="steps"> <p class="p">Pretend to be an audio player (in case recording is blocked):</p> <div class="list"><div class="inner"><div class="region"><ul class="list"><li class="list"><p class="p"><span class="cmd">streamripper -u 'WinampMPEG/5.0' %srv</span></p></li></ul></div></div></div> </li> </ol></div></div></div> |
︙ |
Modified help/html/xiph.html from [7ba00185db] to [475d58c6ed].
︙ | |||
78 79 80 81 82 83 84 85 86 87 88 89 90 91 | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | + + | something which Xiph doesn't approve of. But the drawbacks of their alternative offerings are too severe and user-unfriendly; which is why there's this raw HTML extraction mode now.</p> <p class="p">The website listings contain full station homepages and a few more extras. In this mode we can even acceess the XSPF playlist formats directly. Both, the server search function, or browsing by audio/video format are supported. </p> <div class="note" title="Note"><div class="inner"><div class="region"><div class="contents"><p class="p">A miximum of 100 entries get fetched in this mode however (which is 5 pages รก 20 entries).</p></div></div></div></div> </dd> </dl></div></div></div> </dd> </dl></div></div></div></div></div> </div></div> <div class="sect sect-links" role="navigation"> <div class="hgroup"></div> |
︙ |