From f3040bedcae1f2639fe937590bd9f493157497da Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Tue, 18 Jun 2024 23:48:02 -0400 Subject: oh no shit's broken --- libs/music/player.d/cgi-bin/m3u8.cgi | 7 ++++--- libs/music/player.d/cgi-bin/pcm.cgi | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'libs/music/player.d/cgi-bin') diff --git a/libs/music/player.d/cgi-bin/m3u8.cgi b/libs/music/player.d/cgi-bin/m3u8.cgi index 506ce0e..3e463ca 100755 --- a/libs/music/player.d/cgi-bin/m3u8.cgi +++ b/libs/music/player.d/cgi-bin/m3u8.cgi @@ -18,9 +18,10 @@ print('Content-type: audio/mpegurl',end='\r\n') print(end='\r\n') f.readline() try: - fmt=d['type'][0] if d['type'][0] in ['ogg','flac','opus','m4a'] else 'ogg' + fmt=d['type'][0] if d['type'][0] in ['vorbis','flac','opus','m4a'] else 'vorbis' except KeyError: - fmt='ogg' + fmt='vorbis' +ext='ogg' if fmt == 'vorbis' else fmt for line in f: - print(f'https://filestorage.chrisoft.org/music/{fmt}/{urllib.parse.quote(line.strip())}.{fmt}') + print(f'https://filestorage.chrisoft.org/music/{fmt}/{urllib.parse.quote(line.strip())}.{ext}') f.close() diff --git a/libs/music/player.d/cgi-bin/pcm.cgi b/libs/music/player.d/cgi-bin/pcm.cgi index 34539ad..460b1db 100755 --- a/libs/music/player.d/cgi-bin/pcm.cgi +++ b/libs/music/player.d/cgi-bin/pcm.cgi @@ -4,7 +4,7 @@ from urllib.parse import quote,unquote def getfilelist(d): fmt='ogg' if 'fmt' not in d else d['fmt'] - AUDIO_BASE='//filestorage.chrisoft.org/music/ogg/' + AUDIO_BASE='//filestorage.chrisoft.org/music/vorbis/' ro={'status':200,'message':'OK'} if 'folder' not in d or d['folder']=='': -- cgit v1.2.3