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

⌈⌋ ⎇ branch:  streamtuner2


Check-in [a88fe29963]

Overview
Comment:Fix help.chm lookup and default Windows paths.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a88fe2996319f45a284887fc2cdef207999f167d
User & Date: mario on 2016-12-01 13:19:05
Other Links: manifest | tags
Context
2016-12-02
20:36
Fixed VLC default path (Oliver), added quoting regexp. check-in: 1874107bb9 user: mario tags: trunk
2016-12-01
13:19
Fix help.chm lookup and default Windows paths. check-in: a88fe29963 user: mario tags: trunk
13:18
Minor changes to winstaller script and default package content. check-in: 078495e7da user: mario tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified action.py from [ecd56b9293] to [21a471fadf].

︙
144
145
146
147
148
149
150
151

152
153
154
155
156
157
158

144
145
146
147
148
149
150

151
152
153
154
155
156
157
158








-
+








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

# Open help browser, chm, or streamtuner2 pages
def help(*args):
    for path in ("./help", "/usr/share/doc/streamtuner2/help", "../share/streamtuner2/help"):
    for path in ("./help", "../share/streamtuner2/help", "/usr/share/doc/streamtuner2/help"):
        if not os.path.exists(path):
            continue
        if conf.windows:
            return run(("%s/help.chm" % path).replace("/", '\\'))
        else:
            return run("yelp %s" % path)
    return browser("http://fossil.include-once.org/streamtuner2/doc/tip/help/html/index.html")
︙

Modified config.py from [5e8b20930b] to [2f5daeee00].

︙
178
179
180
181
182
183
184
185

186
187
188
189



190
191
192
193
194
195
196

178
179
180
181
182
183
184

185
186



187
188
189
190
191
192
193
194
195
196








-
+

-
-
-
+
+
+








        for bin in players[typ]:
            if find_executable(bin.split()[0]):
                return bin
        return default

    # Windows look for c:/program files/*/*.exe
    def find_player_win(self, typ="audio", default="wmplayer %asx", append=""):
        base = [os.environ["ProgramFiles"], "c:/windows", "c:/program files", "c:/windows/internet explorer/"]
        base = [os.environ["ProgramFiles"], "c:\\windows", "c:\\program files", "c:\\windows\\internet explorer\\"]
        players = {
            "audio": ["/VLC*/vlc.exe", "wmplayer.exe %asx"],
            "browser": ["/Moz*/firefox.exe", "iexplore.exe %url"],
            "xterm": ['/D "C:/program files/streamripper" streamripper.exe %srv']
            "audio": ["\\VLC*\\vlc.exe", "wmplayer.exe %asx"],
            "browser": ["\\Moz*\\firefox.exe", "iexplore.exe %url"],
            "xterm": ['/D "C:\\program files\\streamripper" streamripper.exe %srv']
        }
        typ = typ if typ in players else "audio"
        for bin in players[typ]:
            for b in base:
                fn = glob.glob(b + bin)
                if len(fn):
                    return fn[0] + append
︙