From 83f1b22f1c371d9ab38dd8756296b51b6ae2c78b Mon Sep 17 00:00:00 2001 From: Halhadus Date: Sat, 15 Feb 2025 13:56:03 +0300 Subject: [PATCH] Added support for other providers --- addotherproviders.py | 145 +++++++++++++++++++++++++++++++++++++++++++ old-music.db | Bin 196608 -> 200704 bytes other-providers.txt | 1 + websitemodule.py | 143 +++++++++++++++++++++--------------------- 4 files changed, 217 insertions(+), 72 deletions(-) create mode 100644 addotherproviders.py create mode 100644 other-providers.txt diff --git a/addotherproviders.py b/addotherproviders.py new file mode 100644 index 0000000..3efbd3c --- /dev/null +++ b/addotherproviders.py @@ -0,0 +1,145 @@ +import os +import sqlite3 +import tinytag +import yt_dlp +from urllib.parse import urlparse + +def initialize_database(): + conn = sqlite3.connect('music.db') + c = conn.cursor() + c.execute('''CREATE TABLE IF NOT EXISTS music + (listmusicname TEXT, listvideoid TEXT, listprovider TEXT, + filelocation TEXT, fileartistname TEXT, filealbumname TEXT, + filemusictitle TEXT, fileduration REAL)''') + conn.commit() + conn.close() + +def get_download_path(): + locations = [ + '/mnt/sdcard/Music', + '/storage/emulated/0/Music', + '/sdcard/Music', + os.path.join(os.environ.get('HOME', ''), 'Music'), + os.path.join(os.getcwd(), 'music') + ] + for loc in locations: + if os.path.exists(loc): + return loc + default = os.path.join(os.environ['HOME'], 'Music') if 'HOME' in os.environ else os.path.join(os.getcwd(), 'music') + os.makedirs(default, exist_ok=True) + return default + +def clean_url(url): + parsed = urlparse(url) + return parsed.netloc + parsed.path + +def collect_entries(): + entries = [] + print("\nAdd new music (enter 'q' to quit)") + while True: + name = input("\nDisplay name: ").strip() + if name.lower() == 'q': + break + url = input("URL: ").strip() + fmt = input("Download format (e.g., bestaudio): ").strip() + + if not all([name, url, fmt]): + print("Invalid input! All fields required.") + continue + + entries.append(f"{name} --- {url} --- {fmt}") + + if entries: + with open('other-providers.txt', 'a') as f: + f.write('\n'.join(entries) + '\n') + print("\nEntries saved to file!") + +def process_downloads(): + download_path = get_download_path() + conn = sqlite3.connect('music.db') + c = conn.cursor() + + if not os.path.exists('other-providers.txt'): + print("No input file found!") + return + + with open('other-providers.txt', 'r') as f: + lines = [line.strip() for line in f if line.strip() and not line.startswith('#')] + + success_count = 0 + errors = [] + + for idx, line in enumerate(lines, 1): + try: + parts = line.split(' --- ') + if len(parts) != 3: + raise ValueError("Invalid line format") + + display_name, url, fmt = parts + print(f"\nProcessing ({idx}/{len(lines)}): {display_name}") + + # Configure yt-dlp + ydl_opts = { + 'format': fmt, + 'outtmpl': '%(title)s.%(ext)s', + 'writethumbnail': True, + 'postprocessors': [ + {'key': 'EmbedThumbnail'}, + {'key': 'FFmpegMetadata'} + ], + 'quiet': True, + 'nooverwrites': True, + 'restrictfilenames': True + } + + # Download and get filename + with yt_dlp.YoutubeDL(ydl_opts) as ydl: + info = ydl.extract_info(url) + filename = ydl.prepare_filename(info) + final_path = os.path.join(download_path, os.path.basename(filename)) + + if os.path.exists(final_path): + print("File exists, skipping...") + continue + + # Download and move file + ydl.download([url]) + os.system(f'mv "{filename}" "{final_path}"') + + # Extract metadata + tag = tinytag.TinyTag.get(final_path) + metadata = { + 'artist': tag.artist or 'Unknown', + 'album': tag.album or 'Unknown', + 'title': tag.title or display_name, + 'duration': tag.duration or 0 + } + + # Prepare database entry + cleaned_url = clean_url(url) + c.execute('''INSERT INTO music VALUES + (?,?,?,?,?,?,?,?)''', + (display_name, cleaned_url, 'other', final_path, + metadata['artist'], metadata['album'], + metadata['title'], metadata['duration'])) + conn.commit() + success_count += 1 + + except Exception as e: + errors.append((line, str(e))) + print(f"Error: {str(e)}") + continue + + conn.close() + + # Print summary + print(f"\nProcessing complete!\nSuccess: {success_count}\nErrors: {len(errors)}") + if errors: + print("\nError details:") + for error in errors: + print(f"- {error[0]}: {error[1]}") + +if __name__ == "__main__": + initialize_database() + collect_entries() + process_downloads() diff --git a/old-music.db b/old-music.db index 91914726aae57fcd0464e6d6360000709de9a8f5..d336a7f6f56cc504a19338868b58b5382119840c 100644 GIT binary patch delta 4810 zcmbVQO>7(25f*9LGG$4wOIrjHIDP^V+k!=kyZo=?G^GA0krZi>k}MUiyCR>+6_@+S z{UNz>ZG~xp6_6fk@W5M>07ZQ%+^~lxKz#|MpogXb0`!nu(__#}d~%BdZD*GhMM<_~ z=b$CEZ)U#l&CHvb$9LWtc;|zGUtKX!4^e0!Z5Zt7=`o!5_MG=NOP>uj5+4|P>%Q}U zJ?j{H3M)NSec*em#-XRp(l3WjIaTTB&t6xby>9sU+3Uu^FUKzSlzYyF=i0*}t9j^*uWChtps8-amE6_|&*!_{uQfQ+`;Q4%AYr)E~E*@7ro7pCw8} z6lElqhfg~SF#^+mU;(2LJeD@6-HVBeGM}k`8W`R>QQkp{ve+f18%IgGP{0DBowNsC zPmvP!2~0XKq71{QF)GL+n?^;BQ8-qVMmvPA>15DNjnXyB>vGVwGpc9` z+RSA9wbv~3SQ6yISeW6;L=Z6#dr9O7=GiKj+E^&vt|*bII(2n;>&1dP@%A$67;0N- zf6y+!gMOe2rdu|1{<7tob)MzeBF;MiFNygK055Jbd5MYP*ed1BS1aP|N-8#9;H7af zlV*ha?>|4=`1TXyxy%9a7IxcKl38PN2bO8K)8X~jE~+Kdgw0&KM%k=kMi3MP@FF-7 z(3e>$M`Q`D5IJ7VOcz$Cv)I#kc-Jtzb&RNvdtiOfVltg8w2XIIrk#|-NoUle>4wd` zVtvhON#SxCZvuW4XJP-<%{y^nb~2S*adx)dc<&R#VBw&gj@!~r)}9 zj;Q2Z&1y5(W@h4XYl0~jAt^BGLTm(LIlkV6FDrfVy^M@ z8-uxDo{cH1d|+n1T5paGyS}TPEuCzaHaddbhDF!cF(WySu8*E5KzrN{%Kh$Ll|NUz z3_FihN~QMBBQLl0Ym!}8#+EX#}F7w{IxO=JU+sfoGCSpDg@maVR>oaoTw ztRC^pQg<}Q0Gwyh1d$|JV8&2r=Lv^-2?e(xLdTii^Wp((qpz+(duRvct<9^2e(liI zuDvm0g>tex(){dw6l3_EM+7ov256xKF0A3a!e@QUnT+IMs9JktuH6oBTCJ$I4f#e}b z*Mm@6qpT!x7%j1Bi3ltf(VBuJh+ZsWdO#40Y7+IJSq4rv~zOx-YQY{*X zabJPcTP;$w-|6tUYXfRtFGiyyBi1CVhc>|o5)Y@*jwZ2)1qmhd%9O$@bbzWPf{o@E zP>hZd)ma`~-?y{>O)LHoSF5_AfNJN7waGSaAhViYS&eFd6{x^z({^$NU^>5?v z&N#H;!Q7kaIUgRHAN*=CHt^?x)VU}9|LPw!{p9SQ`u^Fsaps#d`P1K?mV3YM%`{8i z-mA)XpUG}B|LD@KE7l1&4I0j)$6wt(y|-OU+x9XX;V{Ez#8?s+<12I3kk`G}u^Ow74TJcw;ECWJ zlL05}ySm-m!o1mWaZq3xC_GXw5}%zScYW@tT|X1+ZK%%raZn*FF&#k{r9s`>K4luW znSXrg=E$ChLo9)KOhe8_(iLVhdfT~iS04u0HrBqtNnrbuE}tLL{K2--MA^)DFWt25 zp~VQvq6t<~5Iwh&n~l+xFgsOeeq-5aqe}%m4%%PKs`vZvLC8lh+p#smX3zu_f30*&j6jQMwl!EmH-mT6P$N+iMw_%g zZG~|ri*u0wH0^ZquG^CfjM%8HLZ>@q=Vi_4+u76A2y`nR{vTa`A)Sd)%I|S_{k6B% zpY<=o=1v7>Z&*_TID*s84g_jV78LE)H^paAd|ls86!K1#s_W83l3fb5^7v(Rbk$25p@Wgb_TTJ;-Y#_OJQ;3#trM$8Ny}OfwDeX1OjLQXW)*?afI+ z2Oe9Hc{D3Uib)b#wI}4_F2sqpFyEHZvZfE?Yx_ z%tJ}hB5wzOVn&n&oL0O+f!`?Fb9&EcIR0Z8>T9nxemh_sd3#Tif->##*ZS0I>#}IE zStA(YJdYxRHpYO_Nx1+c8rD9e%5r=%y(#&WdNV&(>8D#TwT&R6q0#fJ37fC5hQVGQV`~Y&gwGNnh2jKqhoa~v@}~!$_rN|f32*R z`zw&vZzPxPmT5LGKu3@4HaB;h9LbOE-8SNa#OyrEvRcrBFph=bZk^t3?!Ld|Aj=pkPbcd6MTKb9X=5c?9>e9hIczJo@a{ zjF1PWa2;tLr1fUAKm}Y5SIw=;rijg~*jC1^Q$ikeBSc^{HwO8<_A^bA&Fj%+~q;>LLGLt(`^dBy!M3$FekQdN6%(nWgB*VkaO&fUKM?hWBEh+#1 E0peFy_y7O^ delta 100 zcmV-q0Gt1SpbUV343HlIFp(fa41QV-000014>kY~HnDNV4wq1%0R)pb56uWI4)*{6 z001zP3=mqeag+{&`W}b+9s#%d9s&x{6bK1a01rG4!42UJL<_+Rp$Xp!RIzb93Aa@F G0;~p_z#e)4 diff --git a/other-providers.txt b/other-providers.txt new file mode 100644 index 0000000..c1d3a74 --- /dev/null +++ b/other-providers.txt @@ -0,0 +1 @@ +C418 - stranger_think --- https://c418.bandcamp.com/track/stranger-think --- flac diff --git a/websitemodule.py b/websitemodule.py index fddcc9a..f27bab1 100644 --- a/websitemodule.py +++ b/websitemodule.py @@ -2,13 +2,12 @@ import os import random import requests -# Main code written by Halhadus, optimized and stylized by DeepSeek-R1 - -def randomize(listurl): # Data fetching and cleaning - musiclist = requests.get(listurl).text.split("\n") - musiclist = [m.strip() for m in musiclist if m.strip() != ""] - - # HTML base template +def randomize(base_url): + # Fetch both lists + yt_list = requests.get(f"{base_url}musiclist.txt").text.split("\n") + other_list = requests.get(f"{base_url}other-providers.txt").text.split("\n") + + # HTML template html = """ @@ -16,12 +15,7 @@ def randomize(listurl): # Data fetching and Halhadus' Music List - - - - - - +