Check-in [433bf11914]
Overview
Comment: | New logo, updated documentation. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
433bf11914f38751528e7f240f550fca |
User & Date: | mario on 2014-05-28 13:01:25 |
Original Comment: | New logo, updated documentation. |
Other Links: | manifest | tags |
Context
2014-05-28
| ||
15:52 | Fix regex URL extraction. check-in: 21aac94806 user: mario tags: trunk | |
13:01 | New logo, updated documentation. check-in: 433bf11914 user: mario tags: trunk | |
01:33 | Simpler rx/dom alternation code. check-in: fd03da93ec user: mario tags: trunk | |
Changes
Modified channels/surfmusik.py from [2563179fb4] to [d0e165b8d6].
︙ | ︙ | |||
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 | # # They do have a Windows client, hencewhy it's even more important for # streamtuner2 to support it on other plattforms. # # TV stations don't seem to work mostly. And loading the webtv/ pages would # be somewhat slow (for querying the actual mms:// streams). # # import re import ahttp as http from config import conf from channels import * # Surfmusik sharing site class surfmusik (ChannelPlugin): # description title = "SurfMusik" module = "surfmusik" homepage = "http://www.surfmusik.de/" base = "http://www.surfmusik.de/" listformat = "audio/x-scpls" categories = [ | > > > | > | 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 | # # They do have a Windows client, hencewhy it's even more important for # streamtuner2 to support it on other plattforms. # # TV stations don't seem to work mostly. And loading the webtv/ pages would # be somewhat slow (for querying the actual mms:// streams). # # * There's also an English version //surfmusic.com/ # So it might make sense to duplicate it with alternative category titles. # import re import ahttp as http from config import conf from channels import * # Surfmusik sharing site class surfmusik (ChannelPlugin): # description title = "SurfMusik" module = "surfmusik" homepage = "http://www.surfmusik.de/" base = "http://www.surfmusik.de/" base2 = "http://www.surfmusic.de/" listformat = "audio/x-scpls" categories = [ "Genres", ["50ger 50s", "Dubstep", "Latin Jazz", "Schlager", "60ger 60s", "Electronic", "Latino", "Sega", "70ger 70s", "Eurodance ", "Lounge", "Soft", "80ger 80s", "Filmmusik", "Metal", "Sport", "90ger 90s", "Flamenco", "Merengue", "Swing", "Acid", "Gay", "Mix", "Tamil", "Ambient", "Gospel", "New Age", "Tango", "Arabische Musik", "Gothic", "News", "Techno", "Afrikanische Musik", "Groove", "Nostalgie", "Gabber", "Artist Radio ", "Halloween", "Hardstyle", "Bachata", "Hip Hop", "Oldies", "Jumpstyle", "Bhangra", "Hoerspiel Radio", "Minimal", "Balladen", "House", "Pop", "Schranz", "Big Band", "Indian", "Punk", "Top 40", "Blues", "Indisch", "Radioversprecher", "Trance", "Bollywood", "Instrumentalmusik", "Reggae", "Trip Hop", "Campusradio", "Information", "RnB", "Tropical", "Celtic", "Italo Disco ", "Rochester", "Urban", "Chillout", "Jazz", "Rock", "Variety", "Country", "Karnevalsmusik", "Rock n Roll", "Volksmusik", "Dance", "Kinderradio", "Rumba/Salsa", "Zumba", "Discofox", "Kirchlich", "Russische Chansons", "Drum n Bass", "Klassik", "Salsa"], "Deutschland", ["Baden Wuerttemberg", "Niedersachsen", "Bayern", "Nordrhein-Westfalen", "Berlin", "Rheinland-Pfalz", "Brandenburg", "Saarland", "Bremen", "Sachsen", "Hamburg", "Sachsen-Anhalt", "Hessen", "Schleswig-Holstein", "Mecklenburg-Vorpommern", "Thueringen"], "Europa", ["Albanien", "Griechenland", "Mallorca", "Slowakei", "Andorra", "Irland", "Malta", "Slovenien", "Armenien", "Island", "Niederlande", "Spanien", "Aserbaidschan", "Italien", "Norwegen", "Tschech. Republ", "Belgien", "Kasachstan", "Oesterreich", "Tuerkei", "Bosnien", "Kanarische Inseln", "Polen", "Ungarn", "Bulgarien", "Kirgistan", "Portugal", "Ukraine", "Daenemark", "Kroatien", "Rumaenien", "Wales", "Deutschland", "Lettland", "Russland", "Weissrussland", "England", "Liechtenstein", "Schottland", "Zypern", "Estland", "Litauen", "Schweden", "Finnland", "Luxemburg", "Schweiz", "Frankreich", "Mazedonien", "Serbien"], "Afrika", ["Angola", "Malawi", "Aethiopien", "Mauritius", "Aegypten", "Marokko", "Algerien", "Namibia", "Benin", "Nigeria", "Burundi", "Reunion", "Elfenbeinkueste", "Senegal", "Gabun", "Simbabwe", "Ghana", "Somalia", "Kamerun", "Sudan", "Kap Verde", "Suedafrika", "Kenia", "Tansania", "Kongo", "Togo", "Libyen", "Tunesien", "Madagaskar", "Uganda", "Mali"], "USA", ["Alabama", "Illinois", "Montana", "Rhode Island", "Alaska", "Indiana", "Nebraska", "South Carolina", "Arizona", "Iowa", "Nevada", "South Dakota", "Arkansas", "Kansas", "New Hampshire", "Tennessee", "Californien", "Kentucky", "New Jersey", "Texas", "Colorado", "Louisiana", "New Mexico", "Utah", "Connecticut", "Maine", "New York", "Vermont", "Delaware", "Maryland", "North Carolina", "Virginia", "Distr.Columbia", "Massachusetts", "North Dakota", "Washington", "Florida", "Michigan", "Ohio", "West Virginia", "Georgia", "Minnesota", "Oklahoma", "Wisconsin", "Hawaii", "Mississippi", "Oregon", "Wyoming", "Idaho", "Missouri", "Pennsylvania", "NOAA Wetter Radio"], "Kanada", ["Alberta", "Ontario", "British Columbia", "Prince Edward Island", "Manitoba", "Québec", "Neufundland", "Saskatchewan", "New Brunswick", "Nordwest-Territorien", "Nova Scotia", "Yukon", "Nunavut",], "Amerika", ["Mexiko", "Costa Rica", "Argentinien", "Aruba", "El Salvador", "Bolivien", "Antigua", "Guatemala", "Brasilien", "Barbados", "Honduras", "Chile", "Bahamas", "Nicaragua", "Ecuador", "Bermuda", "Panama", "Guyana", "Curaçao", "Guyana", "Domenik. Republ", "Kolumbien", "Grenada", "Paraguay", "Guadeloupe", "Uruguay", "Haiti", "Suriname", "Jamaika", "Peru", "Kaimaninseln", "Venezuela", "Kuba", "Martinique", "Puerto Rico", "St.Lucia", "Saint Martin", "Trinidad und Tobago"], "Asien", ["Afghanistan", "Kirgistan", "Vereinigte Arabische Emirate", "Sued-Korea", "Bahrain", "Kuwait", "Bangladesch", "Libanon", "Brunei", "Malaysia", "China", "Nepal", "Guam", "Oman", "Hong Kong", "Pakistan", "Iran", "Palaestina", "Indien", "Philippinen", "Indonesien", "Saudi Arabien", "Israel", "Singapur", "Jordanien", "Sri Lanka", "Japan", "Syrien", "Kambodscha", "Taiwan", "Kasachstan", "Thailand",], "Ozeanien", ["Australien", "Neuseeland", "Suedpol", "Fidschi", "Papanew", "Tahiti",], #"SurfTV", "MusikTV", "NewsTV", "Poli", "Flug", ] titles = dict( genre="Genre", title="Station", playing="Location", bitrate=False, listeners=False ) config = [ #{"name": "surfmusik_lang", "type": "select", "select":"DE=SurfMusik.de|EN=SurfMusic.de", "description": "You can alternatively use the German or English category titles.", "category": "language"} ] # just a static list for now def update_categories(self): pass |
︙ | ︙ |
Modified help/channel_internetradioorguk.page from [2b813fa74f] to [59947f4c4b].
1 2 3 4 5 6 7 8 9 10 11 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="internet_radio_org_uk"> <info> <link type="guide" xref="index#channels"/> <link type="guide" xref="channels#list"/> <link type="guide" xref="configuration#plugins"/> <desc>Large radio directory from the UK.</desc> </info> | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="internet_radio_org_uk"> <info> <link type="guide" xref="index#channels"/> <link type="guide" xref="channels#list"/> <link type="guide" xref="configuration#plugins"/> <desc>Large radio directory from the UK.</desc> </info> <title>Internet-Radio.com</title> <p>I-R.com is a good alternative to Shoutcast. It also lacks a channel homepage in most cases, but is a likewise encyclopedical directory. Genres are similiar to Shoutcast.</p> <note><p>Note that this plugin uses its own setting for how many links to retrieve. Instead of stream numbers, it only counts pages (which however speeds up processing now).</p></note> </page> |
Modified help/channel_jamendo.page from [8c3bbdc135] to [8b3031f5df].
︙ | ︙ | |||
10 11 12 13 14 15 16 | <title>Jamendo</title> <p>Jamendo is a Creative Comments licensing oriented music distributor. It hosts audio files for individual musicians and artists. Tracks and albums can thus be downloaded free of charge. Yeah, imagine that.</p> | | > | > > | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | <title>Jamendo</title> <p>Jamendo is a Creative Comments licensing oriented music distributor. It hosts audio files for individual musicians and artists. Tracks and albums can thus be downloaded free of charge. Yeah, imagine that.</p> <p>The new Jamendo v3.0 is now utilized. It allows to list albums, playlists, and individual tracks by genre. Radios are a static list.</p> <p>Instead of favicons, streamtuner2 can fetch album or track covers. Thus the images are a bit larger, and retrieving them all via Channel > Load favicons... takes a while longer.</p> </page> |
Added help/channel_surfmusik.page version [b4d43ce77f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="surfmusik"> <info> <link type="guide" xref="index#channels"/> <link type="guide" xref="channels#list"/> <link type="guide" xref="configuration#plugins"/> <desc>International radio listings.</desc> </info> <title>SurfMusic</title> <p><link href="http://surfmusic.de/">SurfMusic</link> is a user-collection of internet radios. It's grouped by genres, or locations / countries.</p> <p>It's both pretty large and rather quick to extract listings from. And it mostly includes station homepage links.</p> <p>The MusicTV and NewsTV sections also return results, but those are mostly web-based video stations. Some of them are outdated links even.</p> <terms> <title>Channel options.</title> <item> <title><code>Language</code></title> <p>The current version is German-only. The English genre titles will be added later.</p> </item> </terms> </page> |
Added help/channel_youtube.page version [6618255c03].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="youtube"> <info> <link type="guide" xref="index#channels"/> <link type="guide" xref="channels#list"/> <link type="guide" xref="configuration#plugins"/> <desc>Youtube music/video listings.</desc> </info> <title>Youtube</title> <p>Googles <link href="https://youtube.com/">Youtube</link> provides a quirky JSON API that makes browsing channels and genres feasible. This beta plugin provides a little overview, and usually retrieves recent video uploads.</p> <p>VLC can directly play Youtube URLs. For other players the default application setting wraps <link href="http://youtube-dl.org/">youtube-dl</link>, which is also used for recording.</p> <terms> <title>Channel options.</title> <item> <title><code>Region</code></title> <p>With the country dropdown you can predefine which mostPopular listins are returned.</p> </item> <item> <title><code>My Channels</code></title> <p>You can edit the list of YT channel names to fetch some of your favourite artists/uploaders. To apply this setting, and have new categories show up in the genre pane, use <guiseq><gui>Channel</gui> <gui>Update category tree</gui></guiseq> first. </p> </item> </terms> </page> |
Modified help/channels.page from [3889f26dc8] to [744e5a3fbd].
1 2 3 4 5 6 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="channels"> <info> <link type="guide" xref="index#browsing"/> | | | | | 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 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="channels"> <info> <link type="guide" xref="index#browsing"/> <desc>Switching through the channel tabs, different radio directory services.</desc> </info> <title>Channels</title> <p>The tabs in the main window represent the music directory channels. Each lists categories and streams from a specific radio directory.</p> <media type="image" mime="image/png" src="img/channels.png">Tabs</media> <p>If you first select a channel tab, the categories should appear or be loading. Otherwise:</p> <steps> <item><p>Select a channel tab</p></item> <item><p>Choose <guiseq><gui>Channel</gui> <gui>Reload categories...</gui></guiseq></p></item> <item><p>Pick a category/genre from the overview, left.</p></item> </steps> <p>Individual channels provide different music/radio information. The table views are mostly identical in each tab. (You could modify the <code>datamap[]</code> in the plugin files if you wanted to adapt this.)</p> <section id="list"> <title>Available channels</title> </section> <section id="homepage"> |
︙ | ︙ |
Modified help/config_apps.page from [c1d5b4e9e9] to [7170402703].
︙ | ︙ | |||
23 24 25 26 27 28 29 | <tr><td>mplayer</td><td>mplayer %srv</td><td>console</td></tr> <tr><td>VLC</td><td>vlc %u</td><td>video/*</td></tr> <tr><td>Totem</td><td>totem %u</td><td>video/*</td></tr> <tr><td>Media Player</td><td>mplayer2.exe %pls</td><td>Win32</td></tr> </table> <p>Some audio players open a second instance when you actually want to switch radios. | | | > > | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | <tr><td>mplayer</td><td>mplayer %srv</td><td>console</td></tr> <tr><td>VLC</td><td>vlc %u</td><td>video/*</td></tr> <tr><td>Totem</td><td>totem %u</td><td>video/*</td></tr> <tr><td>Media Player</td><td>mplayer2.exe %pls</td><td>Win32</td></tr> </table> <p>Some audio players open a second instance when you actually want to switch radios. In this case it's a common workaround to write <code>pkill vlc ; vlc %u</code> instead, which ends the previous player process and starts it anew. For VLC there's however also the option <code>--one-instance</code>, which sometimes works better.</p> <p>Some applications, like Rhythmbox or Banshee, are primarily audio browsers, not players, and cannot be invoked with a play URL by other apps. This makes them less suitable for use with streamtuner2.</p> <section id="abbr"> <title>URL placeholders</title> <p>Any listed application can be invoked with a different kind of URL or filename.be invoked with a play URL by other apps. Which to use often depends on the application.</p> <table shade="rows" rules="rows cols"> |
︙ | ︙ |
Modified help/configuration.page from [f270174d2c] to [417246e789].
1 2 3 4 5 6 7 8 9 10 11 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="configuration"> <info> <link type="guide" xref="index#configuration"/> <desc><key>F12</key> brings up the options window with the Player, Display, System and Plugin sections.</desc> </info> <title>Settings dialog</title> | > | | | | | | < < < < | > | | | | | | | | | | > | > > < < < < < < | | | 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 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="configuration"> <info> <link type="guide" xref="index#configuration"/> <desc><key>F12</key> brings up the options window with the Player, Display, System and Plugin sections.</desc> </info> <title>Settings dialog</title> <p>There are multiple behaviour options in streamtuner2. You can find the settings dialog in the edit menu as "Preferences" (last entry). </p> <terms> <title>It is separated into three main areas.</title> <item> <title>Player</title> <p>Lists audio formats and the audio player applications, or recording tools below.</p> </item> <item> <title>Options</title> <p>Influences the display of all stream/station lists, and contains some system settings.</p> </item> <item> <title>Channel Plugins</title> <p>Every channel tab can have specific options. These are configured here. Also you can disable channels you don't need.</p> </item> </terms> <section id="apps"> <title>Player application settings</title> <p>MIME types are elaborate identifiers for file types; audio/mp3 for example represents MP3 files, and audio/ogg means just OGG.</p> <p>The text entry fields can hold the application name of an audio player. Often the application name is just a lower case version of the program title.</p> <p>Behind application names a placeholder can be used. On invocation such placeholders get replaced with an URL (a http://..-Link) or filename for the selected radio stream.</p> <p>It's introduced by a percent sign, and followed by letters. %m3u for example generates a .m3u file, which most audio players understand. Otherwise try %pls, which might even be faster because streamtuner2 doesn't have to download and preprocess it. Alternatively %srv instead gives a direct stream link.</p> <p>Catch-all entries like */* or a generic audio/* entry allow to configure a default player. </p> <p><title>Recording</title></p> <p>The second block of entries in the 'Apps' section specifies recording applications. Here streamripper is preconfigured for audio streams, and youtube-dl for Youtube videos for instance. To define a target directory, you can add commandline arguments to each. Also it's typically helpful to leave the xterm prefix on, so you can follow the processing state. (Alternatively to xterm there is x-terminal-emulator, or rxvt, gnome-terminal, xfce4-terminal, etc.)</p> </section> <section id="gui"> <title>Display/GUI options</title> <p>Most options here a self-explanatory. The options for the favicons define if station entries should show little icons. Not all stations have one, so you might as well turn this off to conserve a little memory.</p> <p>The number of stations setting is not honored by all channel plugins. Often it's not possible to load more or fewer station entries. Some plugins have own settings (in the 'Plugins' section) even. For the major plugins this however limits how much scroll text appears in the stream lists.</p> <p>"Retain deleted stations" keeps old entries, when you reload a category/genre. Shoutcast often forgets stations or throws them out. If you keep this option enabled, these entries are kept in streamtuner2. Browse down in the stations list to still see them.</p> <p>It's possible to select a Gtk+ theme. But not all themes work with all Gtk display engines, and not all themes work with streamtuner2. You just have to try it.</p> <p>Remembering window states makes streamtuner2 not forget which channel and category was last selected. You can however disable this option, and instead manually save the window states/layout in the edit menu, if you want.</p> <p>Setting another temporary directory might be useful, if you want to keep the temporary .m3u cache files. They are created whenever you hit play. For archival or speed-up porposes you might want to keep them elsewhere. They don't take a lot of space.</p> </section> <section id="plugins"> <title>Plugin and Channel settings</title> <p>Each channel plugin can bring its own list of configuration settings. These are collected here.</p> <p>The heading for each plugin allows to enable or disable it. To apply changed states you need to restart streamtuner2 however.</p> <p>If you want to find out more about the short option descriptions (most settings are checkboxes), please have a look into the channels directory /usr/share/streamtuner2/channels/ and corresponding *.py files. These are readable, and sometimes contain more information.</p> </section> </page> |
Modified help/search.page from [04296c65b6] to [5645afb77b].
1 2 3 4 5 6 7 8 9 10 11 12 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="search"> <info> <link type="guide" xref="bookmarks#other"/> <link type="guide" xref="index#functions"/> <desc>Quicksearch field and Ctrl+F compound search window.</desc> </info> <title>Searching</title> | | | | > > > > > > | < < < > > < < < < < < | 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 | <page xmlns="http://projectmallard.org/1.0/" type="guide" id="search"> <info> <link type="guide" xref="bookmarks#other"/> <link type="guide" xref="index#functions"/> <desc>Quicksearch field and Ctrl+F compound search window.</desc> </info> <title>Searching</title> <p>There are two search functions.</p> <section id="quicksearch"> <title>Quick search</title> <p>Just enter text into the quick search box atop. Streamtuner2 will instantly highlight any matches in the current stations view. If you switch tabs, just click the glass icon to reapply the highlighting.</p> </section> <section id="cachesearch"> <title>Search window</title> <p>You can get to the search dialog via <guiseq><gui>Edit</gui> <gui>Find</gui></guiseq> or <key>Ctrl</key>+<key>F</key>. Centrally to this dialog is the text field, where you can specify the phrase to scan for.</p> <p>Above you can check which channel plugins to inspect for the search term. Using this allows to limit the search to specific radio station directories, but usually you want to search them all.</p> <p>Below the search phrase text box, you can specifiy which station fields to look into. Often you just want to search the titles of radio stations. But you can also have the search occour in the description/playing fields. Alternatively you could just search the homepage links.</p> <p>Lastly, there are three search methods. You mostly want to use the <gui>cache search</gui>, which just scans through the station lists streamtuner2 has downloaded. Since you are mostly looking for something you had already seen, this will give you the desired results.</p> <p>The <gui>server search</gui> would try to do a live search on the directory servers, providing you with the most recent data. However, it's not implemented for all channel plugins, and therefore brings limited output.</p> <p>Use the button <gui>google it</gui> as last resort, if streamtuner2 didn't find anything.</p> </section> </page> |
Modified streamtuner2.png from [48f3277ab2] to [de28e7634f].
cannot compute difference between binary files