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

⌈⌋ ⎇ branch:  streamtuner2


Check-in [b728f45203]

Overview
Comment:Fix simplified regex to stop before }}} for URL extraction.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b728f452031cdd650587b62367e22780b0ba684c
User & Date: mario on 2015-05-24 17:46:56
Other Links: manifest | tags
Context
2015-05-26
00:40
Fix action.browser() to use only row{}, not pass url= argument. Native JAMJSON extractor now tests for ["tracks"] or uses plain ["results"] list. check-in: 84114ae636 user: mario tags: trunk
2015-05-24
17:46
Fix simplified regex to stop before }}} for URL extraction. check-in: b728f45203 user: mario tags: trunk
17:46
Fix unqualified icon_dir reference. check-in: e2c2c405e7 user: mario tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified channels/ubuntuusers.py from [d59a32fd62] to [664a150864].

︙︙
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

        # regexp lists out, just one srv url per entry
        ls = re.findall(r"""
           ^\s*([\w\s.-]+)\s*==+\s+
           (?: ^\[(http[^\s\]]+) .*? \{(\w+)\} )?
           .*?
           ^\{\{\{
           .*?
           (\w+://[^"'\s]+)
        """, src, re.X|re.S|re.M)
        
        # pack into row list
        return [
           dict(genre=g, title=t, url=u, homepage=h, bitrate=0, listeners=0, format=f, listformat="href")
           for t,h,g,u in ls
        ]









|









75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

        # regexp lists out, just one srv url per entry
        ls = re.findall(r"""
           ^\s*([\w\s.-]+)\s*==+\s+
           (?: ^\[(http[^\s\]]+) .*? \{(\w+)\} )?
           .*?
           ^\{\{\{
           .*?
           (\w+://[^"'\s\}\)\]]+)
        """, src, re.X|re.S|re.M)
        
        # pack into row list
        return [
           dict(genre=g, title=t, url=u, homepage=h, bitrate=0, listeners=0, format=f, listformat="href")
           for t,h,g,u in ls
        ]