Internet radio browser GUI for music/video streams from various directory services.

⌈⌋ ⎇ branch:  streamtuner2


Check-in [ecc88e5d3e]

Overview
Comment:Remove some print statements, and switch to log.FUNC where necessary.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ecc88e5d3e4f7cca74bbe8034fdc60655c8fe60d
User & Date: mario on 2015-04-23 01:09:07
Other Links: manifest | tags
Context
2015-04-23
18:57
Make uikit.do() manage a task spool itself. Run new tasks immediately if invoked already within gtk_idle callback. Move uikit.tree column creation into separate function, for immediate use through GenericChannel.gui() - instead of destroying+repopulating it on category-list reloads. check-in: 7f51022370 user: mario tags: trunk
01:09
Remove some print statements, and switch to log.FUNC where necessary. check-in: ecc88e5d3e user: mario tags: trunk
01:08
Add TreePath() abstractions for app_state/restore. check-in: 655dd9f19c user: mario tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified action.py from [b6bfb9c13d] to [4f5c978225].

︙︙
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143

    except: log.ERR("Command not found:", cmd)


# Start web browser
#
def browser(url):
    bin = conf.play.get("url/http", "sensible-browser")
    print url
    run(bin + " " + quote(url))


# Open help browser, streamtuner2 pages
#
def help(*args):
    run("yelp /usr/share/doc/streamtuner2/help/")








|








129
130
131
132
133
134
135
136
137
138
139
140
141
142
143

    except: log.ERR("Command not found:", cmd)


# Start web browser
#
def browser(url):
    bin = conf.play.get("url/http", "sensible-browser")
    log.BROWSER(bin)
    run(bin + " " + quote(url))


# Open help browser, streamtuner2 pages
#
def help(*args):
    run("yelp /usr/share/doc/streamtuner2/help/")
︙︙

Modified channels/__init__.py from [eada7c8200] to [6ef5fada5c].

︙︙
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251


    # Called on switching genre/category.
    # Either fetches new stream data, or displays list from cache.
    def load(self, category, force=False, y=None):

        # called to early
        if not category:
            print "load(None)"
            return
        self.current = category

        # get data from cache or download
        if force or not category in self.streams:
            log.PROC("load", "update_streams")
            self.status("Updating streams...")








|








237
238
239
240
241
242
243
244
245
246
247
248
249
250
251


    # Called on switching genre/category.
    # Either fetches new stream data, or displays list from cache.
    def load(self, category, force=False, y=None):

        # called to early
        if not category:
            log.ERR("load(None)")
            return
        self.current = category

        # get data from cache or download
        if force or not category in self.streams:
            log.PROC("load", "update_streams")
            self.status("Updating streams...")
︙︙

Modified channels/jamendo.py from [43417ad008] to [c57db677e5].

︙︙
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336

                    "format": fmt_mime,
                })
		
        # Feeds (News)
        elif cat == "feeds":
            for e in self.api(method="feeds", order="date_start_desc", target="notlogged"):
              if e.get("joinid") and e.get("subtitle"):
                print e
                entries.append({
                    "genre": e["type"],
                    "title": e["title"]["en"],
                    "playing": e["subtitle"]["en"],
                    "extra": e["text"]["en"],
                    "homepage": e["link"],
                    "format": fmt_mime,








<








322
323
324
325
326
327
328

329
330
331
332
333
334
335

                    "format": fmt_mime,
                })
		
        # Feeds (News)
        elif cat == "feeds":
            for e in self.api(method="feeds", order="date_start_desc", target="notlogged"):
              if e.get("joinid") and e.get("subtitle"):

                entries.append({
                    "genre": e["type"],
                    "title": e["title"]["en"],
                    "playing": e["subtitle"]["en"],
                    "extra": e["text"]["en"],
                    "homepage": e["link"],
                    "format": fmt_mime,
︙︙

Modified cli.py from [c8d63f1db6] to [9a0f511a31].

︙︙
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62

            a = self.help
        # first cmdline arg == action
        else:
            command = actions[0]
            if command in dir(self):
                cmd = self.__getattribute__(command)
            else:
                print "No such command:", command
                return

        # run
        result = cmd(*actions[1:])
        if result:
            self.json(result)
        








|








48
49
50
51
52
53
54
55
56
57
58
59
60
61
62

            a = self.help
        # first cmdline arg == action
        else:
            command = actions[0]
            if command in dir(self):
                cmd = self.__getattribute__(command)
            else:
                log.ERR("No such command:", command)
                return

        # run
        result = cmd(*actions[1:])
        if result:
            self.json(result)
︙︙

Modified help/index.page from [03dacee74b] to [37c7ebd07e].

︙︙
35
36
37
38
39
40
41
42
43
44
45

            <title>Additional features</title>
    	</section>

	<section id="footer">
	<p>You can get additional help from the online forum. See <guiseq><gui>Help</gui> <gui>Forum</gui></guiseq>.</p>

	<p>This documentation was last updated for available functions in streamtuner2
	version 2.1.5, as of April 2015.</p>
	</section>

</page>








|




35
36
37
38
39
40
41
42
43
44
45

            <title>Additional features</title>
    	</section>

	<section id="footer">
	<p>You can get additional help from the online forum. See <guiseq><gui>Help</gui> <gui>Forum</gui></guiseq>.</p>

	<p>This documentation was last updated for available functions in streamtuner2
	version 2.1.7, as of April 2015.</p>
	</section>

</page>