apps/KotoPad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Direct stream works with youtube and spotify links now. Fixed :)

Browse Source
This commit is contained in:
BarsTiger
2022-12-22 22:41:50 +02:00
parent f632f7904f
commit d718ec0bb0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/player/convert.py
View File

@@ -13,8 +13,10 @@ def get_raw_link(url):
if validators.url(url): if validators.url(url):
if 'spotify' in url: if 'spotify' in url:
url = Spotify().get_youtube_url(url) url = Spotify().get_youtube_url(url)
print(url)
if 'youtu' in url: if 'youtu' in url:
url = pafy.new(url).getbestaudio().url url = pafy.new(url).getbestaudio().url
print(url)
return url return url
@@ -23,12 +25,12 @@ def get_ready_media(original: str) -> str | None:
if not os.path.isdir('temp'): if not os.path.isdir('temp'):
os.mkdir('temp') os.mkdir('temp')
if Config.get().direct_stream: if Config.get().direct_stream and os.path.isfile(original):
return original return original
try: try:
namehash = 'temp\\' + hashlib.md5(original.encode('utf-8')).hexdigest() namehash = 'temp\\' + hashlib.md5(original.encode('utf-8')).hexdigest()
if os.path.isfile(namehash): if os.path.isfile(namehash) and not Config.get().direct_stream:
return namehash return namehash
if not os.path.isfile(original): if not os.path.isfile(original):
@@ -38,7 +40,7 @@ def get_ready_media(original: str) -> str | None:
f.write(requests.get(get_raw_link(original)).content) f.write(requests.get(get_raw_link(original)).content)
original = 'tempsound' original = 'tempsound'
else: else:
original = get_raw_link(original) return get_raw_link(original)
(pydub.AudioSegment.from_file(original) + pydub.AudioSegment.silent(1500))\ (pydub.AudioSegment.from_file(original) + pydub.AudioSegment.silent(1500))\
.export(namehash, format='mp3') .export(namehash, format='mp3')