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

⌈⌋ ⎇ branch:  streamtuner2


Check-in [49f14d5102]

Overview
Comment:Check for windows-style paths in specbuttons file lookup
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 49f14d510285edb531b3602e5e0f9cfc7f77f7b0
User & Date: mario on 2017-01-08 12:46:24
Other Links: manifest | tags
Context
2017-01-08
13:38
timer: Test for .queue() result before setting statusbar := "Timer saved" check-in: 5b7a717f18 user: mario tags: trunk
12:46
Check for windows-style paths in specbuttons file lookup check-in: 49f14d5102 user: mario tags: trunk
2017-01-05
21:33
Fix `links` plugin format: attribute; make it understood by channel.play() that a homepage-only row triggers the web browser. check-in: f48ad79aa1 user: mario tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified channels/myoggradio.py from [c318545725] to [9249a00104].

︙︙
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163

    
        for e in (entries if entries else parent.bookmarks.streams["favourite"]):
            self.upload(e)
        

    # send row to MyOggRadio
    def upload(self, e, form=0):
        return True
        if e:
            login = self.user_pw()
            if not login:
                return

            submit = {
                "user": login[0],         # api








<








149
150
151
152
153
154
155

156
157
158
159
160
161
162

    
        for e in (entries if entries else parent.bookmarks.streams["favourite"]):
            self.upload(e)
        

    # send row to MyOggRadio
    def upload(self, e, form=0):

        if e:
            login = self.user_pw()
            if not login:
                return

            submit = {
                "user": login[0],         # api
︙︙
193
194
195
196
197
198
199
200
201
202

        if len(conf.myoggradio_login) and conf.myoggradio_login != "user:password":
            return conf.myoggradio_login.split(":")
        else:
            lap =  conf.netrc(["myoggradio", "myoggradio.org", "www.myoggradio.org"])
            if lap:
                return [lap[0] or lap[1], lap[2]]
            else:
                self.status("No login data for MyOggRadio configured. See F12 for setup, or F1 for help.", timeout=10, icon="gtk-dialog-error")
        pass        









|



192
193
194
195
196
197
198
199
200
201

        if len(conf.myoggradio_login) and conf.myoggradio_login != "user:password":
            return conf.myoggradio_login.split(":")
        else:
            lap =  conf.netrc(["myoggradio", "myoggradio.org", "www.myoggradio.org"])
            if lap:
                return [lap[0] or lap[1], lap[2]]
            else:
                self.warn("No login data for MyOggRadio configured. See F12 for setup, or F1 for help.", timeout=10, icon="gtk-dialog-error")
        pass

Modified channels/specbuttons.py from [bb248c330b] to [06e8ddd1d2].

︙︙
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126

    def update_paths(self):
        r = {}
        for btn, cmd in conf.specbuttons.items():
            # replace "gtk." to "gtk-"
            if re.match("^gtk\.\w+", btn, re.I):
                btn = re.sub("[._]+", "-", btn).lower()
            # not /path or gtk-
            elif not re.match("^/|\./|gtk-", btn):
                path = self.locate(btn)
                if path:
                    btn = path
                else:
                    log.WARN("Extra button icon '%s' could not be found" % btn)
            r[btn] = cmd
        conf.specbuttons = r








|








112
113
114
115
116
117
118
119
120
121
122
123
124
125
126

    def update_paths(self):
        r = {}
        for btn, cmd in conf.specbuttons.items():
            # replace "gtk." to "gtk-"
            if re.match("^gtk\.\w+", btn, re.I):
                btn = re.sub("[._]+", "-", btn).lower()
            # not /path or gtk-
            elif not re.match("^(/|\./|gtk-|\w:[\\\\/])", btn):
                path = self.locate(btn)
                if path:
                    btn = path
                else:
                    log.WARN("Extra button icon '%s' could not be found" % btn)
            r[btn] = cmd
        conf.specbuttons = r
︙︙