From ef02fecaa8cc905e0250629b1d6d1bfd5513d25a Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Nov 2018 23:59:32 +0000 Subject: [PATCH] Lots of small additions --- scripts/stdin2m3u | 31 ++++ state/liquidsoap/config/main.liq | 8 +- state/playlists/normal/Cyber/cyber.m3u | 227 +++++++++++++++++++++++++ web/playlist.php | 1 + 4 files changed, 264 insertions(+), 3 deletions(-) create mode 100755 scripts/stdin2m3u create mode 100644 state/playlists/normal/Cyber/cyber.m3u diff --git a/scripts/stdin2m3u b/scripts/stdin2m3u new file mode 100755 index 0000000..7cc74f8 --- /dev/null +++ b/scripts/stdin2m3u @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +set -euo pipefail +IFS=$'\n\t' + +echo "#EXT3MU" + +function get_duration { + preconvert=$(youtube-dl --get-duration -- "$1" | perl -p -i -e 's/(\d\d?):(\d\d)/$1 minutes+$2 seconds/' 2> /dev/null) + convert=$(units "$preconvert") + stripped=$(echo "$convert" | grep -o '[0-9]*') + echo "$stripped" +} + +function get_title { + result=$(youtube-dl --get-title -- "$1") + echo "$result" +} + +function makeline { + duration=$(get_duration "$1") + title=$(get_title "$1") + echo "#EXTINF:$duration,$title" +} + +videos=$(cat -) +videos=($videos) + +for i in "${videos[@]}"; do + makeline "$i" + echo "ffmpeg2wav:youtube-dl:$i" +done diff --git a/state/liquidsoap/config/main.liq b/state/liquidsoap/config/main.liq index 84643f2..234139a 100644 --- a/state/liquidsoap/config/main.liq +++ b/state/liquidsoap/config/main.liq @@ -37,18 +37,20 @@ live = audio_to_stereo( normal_songs = playlist(reload=600, mime_type="application/x-mpegURL", "http://web/playlist.php") halloween = playlist("/playlists/events/Halloween.m3u") +christmas = playlist("/playlists/events/Chrsitmas.m3u") requests = audio_to_stereo(drop_video(request.queue(id="request"))) jingles = playlist("/jingles") -def is_halloween() = +def is_date(startd, startm, endd, endm) localtime(time(), fun (~sec,~min,~hour,~mday,~mon,~year,~wday,~yday,~isdst) -> - mday >= 22 and mon == 10-1 and mday <=31) # These are POSIX standards, mon: month of year [0,11] + mday >= startd and mon == startm-1 and mday <= endd and mon <= endm-1) # These are POSIX standards, mon: month of year [0,11] end default = switch([ -({is_halloween()}, random(weights = [1,5], [halloween, normal_songs])), +({is_date(22, 10, 31, 10)}, random(weights = [1,5], [halloween, normal_songs])), +({is_date(1, 12, 28, 12)}, random(weights = [1,5], [christmas, normal_songs])), ({true}, normal_songs) ]) diff --git a/state/playlists/normal/Cyber/cyber.m3u b/state/playlists/normal/Cyber/cyber.m3u new file mode 100644 index 0000000..0e15b64 --- /dev/null +++ b/state/playlists/normal/Cyber/cyber.m3u @@ -0,0 +1,227 @@ +#EXT3MU +#EXTINF:191,Aries - RACECAR +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=opANrXefcqs +#EXTINF:186,Aries - SAYONARA +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=QMpEi3wwv3g +#EXTINF:424,Infected mushroom - saeed +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Cxov0BQ2fpE +#EXTINF:285,Christopher Tin - Mado Kara Mieru (Lyric Video with Translations) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=R4Pw3wPSF9Q +#EXTINF:525,Infected Mushroom - Heavyweight +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=h4YvkZeLrjs +#EXTINF:449,Infected Mushroom - Becoming Insane +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=WxhTbxMSvT0 +#EXTINF:446,Infected Mushroom - Send Me an Angel [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=4l8Wkrb5JNw +#EXTINF:217,Joji - SLOW DANCING IN THE DARK +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=K3Qzzggn--s +#EXTINF:366,Infected Mushroom - Never Mind [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=GiXlhwI5xHQ +#EXTINF:388,Infected Mushroom - Nothing to Say [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=1zXJ0LlEmX4 +#EXTINF:388,Infected Mushroom - Nothing to Say [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=1zXJ0LlEmX4 +#EXTINF:395,Infected Mushroom - The Pretender +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=8zH2JP4LgaE +#EXTINF:281,Infected Mushroom - U R So Fucked [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=b8Fad9yJN_o +#EXTINF:423,Infected Mushroom - Nation of Wusses [HD & HQ 1080p] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=hcPxRmpN4UA +#EXTINF:423,Infected Mushroom - Nation of Wusses [HD & HQ 1080p] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=hcPxRmpN4UA +#EXTINF:464,Infected Mushroom - The Rat [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=nWoQ9SZBhWs +#EXTINF:204,Infected Mushroom - Wanted To [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=e9qjNNvsgRg +#EXTINF:404,Infected Mushroom - Serve My Thirst [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=WNEdBU_dPvs +#EXTINF:136,lil peep w/ yung bruh - white tee +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=fudsUhWAG_o +#EXTINF:217,lil peep - gym class +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Llkt3jnOX9Y +#EXTINF:163,witchblades - lil peep x lil tracy +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=E7sP6t1QyrI +#EXTINF:158,lil peep x lil tracy - white wine +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=wckAAh-V428 +#EXTINF:142,lil peep - star shopping (prod. kryptik) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=qwzQPh7dW_4 +#EXTINF:203,lil peep - beamerboy (prod. nedarb) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=PKalQrHXayI +#EXTINF:196,joji - WORLD$TAR MONEY +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=sADmwWhU5ZM +#EXTINF:251,Eminem - Mockingbird [HQ] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=HXpLvOkbC4k +#EXTINF:323,Eminem - Lose Yourself [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=_Yhyp-_hX2s +#EXTINF:281,Eminem - When I'm Gone (Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=rERH2Cbbc_o +#EXTINF:299,Eminem Like Toy Soldiers lyrics +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=1qbuZhVUj_g +#EXTINF:291,Eminem - Without Me ( AUDIO ) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=TqAQiS7uAzU +#EXTINF:285,Eminem - The Real Slim Shady (Lyrics) [HD & HQ] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=l7KEuKKuuas +#EXTINF:369,Eminem - Rap God (Explicit) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=XbGs_qK2PQA +#EXTINF:299,Eminem - Till I Collapse [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=ytQ5CYE1VZw +#EXTINF:328,Eminem - Sing For The Moment +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=D4hAVemuQXY +#EXTINF:246,Eminem - Just Lose It +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=9dcVOmEQzKA +#EXTINF:344,Infected Mushroom - I Shine [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=MjAect9A2To +#EXTINF:432,Infected Mushroom - Drum n Bassa [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=HbpCFsypNGM +#EXTINF:639,Infected Mushroom - The Messenger 2012 [HD] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=_9sB6T29xkI +#EXTINF:207,Infected Mushroom - Where Do I Belong [HQ Audio] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=AXpDTv2ct5o +#EXTINF:358,Infected Mushroom - Now is Gold (feat. Kelsy Karter) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=_zj4WbJv2rQ +#EXTINF:285,Christopher Tin - Mado Kara Mieru (Lyric Video with Translations) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=R4Pw3wPSF9Q +#EXTINF:275,Toto - Africa (Video) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=FTQbiNvZqaY +#EXTINF:199,joji - Head in the Clouds ☁☁☁ (official music video) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=PmfxQHo_Fy4 +#EXTINF:239,Christopher Tin - Sogno di Volare ("The Dream of Flight") (Civilization VI Main Theme) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=WQYN2P3E06s +#EXTINF:443,Africa - Angel City Chorale +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=-c9-poC5HGw +#EXTINF:198,John Denver - Take Me Home, Country Roads (Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=1vrEljMfXYo +#EXTINF:243,Mo Ghille Mear (My Gallant Hero) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=zxjvNUNXhkU +#EXTINF:263,REX ORANGE COUNTY - BEST FRIEND +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=OqBuXQLR4Y8 +#EXTINF:258,Rex Orange County - Sunflower +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Z9e7K6Hx_rY +#EXTINF:264,Initial D - Deja Vu +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=dv13gl0a-FA +#EXTINF:244,Hotblade - Manifold Love (High Quality Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=dK36vthr32M +#EXTINF:246,Kaioh - Nitrofire (High Quality Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=nS-P4npOoIg +#EXTINF:272,Manuel - Gas Gas Gas +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=atuFSv2bLa8 +#EXTINF:286,Running in the 90's +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=BJ0xBCwkg3E +#EXTINF:344,Initial D　　CHEMICAL LOVE +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=15mP2uYUS-4 +#EXTINF:265,Kana-Boon - Silhouette +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=dlFA0Zq1k2A +#EXTINF:246,Asian Kung-Fu Generation - Haruka Kanata (Video Clip) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=nJ6A6GC_ki4 +#EXTINF:238,Hard Knock Life (Ghetto Anthem) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=yvfM5of4UnU +#EXTINF:254,JAY-Z - The Story of O.J. +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=RM7lw0Ovzq0 +#EXTINF:164,JPEGMAFIA - 1539 N. Calvert +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=PO3mri47s7M +#EXTINF:154,JPEGMAFIA - Baby I'm Bleeding +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=974TXFKtyls +#EXTINF:203,JPEGMAFIA x Freaky - I Might Vote 4 Donald Trump +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=7htstbQR868 +#EXTINF:344,Initial D　　CHEMICAL LOVE +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=15mP2uYUS-4 +#EXTINF:152,JPEGMAFIA - Real Nega +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=xIW-L39oqpQ +#EXTINF:199,JPEGMAFIA - Thug Tears +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Se1liN2MogQ +#EXTINF:82,JPEGMAFIA - Libtard Anthem (feat. Freaky) LYRICS +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=_0xPtsUeH_k +#EXTINF:203,SEE YOU AGAIN featuring Kali Uchis +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=TGgcC5xg9YI +#EXTINF:226,Tyler, The Creator - Who Dat Boy +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=FUXX55WqYZs +#EXTINF:220,Congratulations +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=NT7I4ksLXtE +#EXTINF:255,Post Malone - White Iverson (Official Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=XhmGfZ1SeuY +#EXTINF:221,Post Malone Feat. Ty Dolla $ign - Psycho (Official Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=MGYJuETPQEg +#EXTINF:237,Post Malone - Too Young +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=i8Zi1DM7iR4 +#EXTINF:180,Post Malone - Go Flex (Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=vC2owoWdIUs +#EXTINF:218,rockstar +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=AaxFIY-cWH0 +#EXTINF:231,Better Now +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=0tTn95TLIaw +#EXTINF:220,Post Malone - I Fall Apart +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=7a66clRobKI +#EXTINF:208,Lil Peep - 4 GOLD CHAINS ft. Clams Casino (Official Video) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=NEoVjmfYlJ8 +#EXTINF:325,Kanye West & Kid Cudi - Reborn (Kids See Ghosts) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Y8ibdsPYOgw +#EXTINF:245,Kanye West & Kid Cudi - Kids See Ghosts Ft Yasiin Bey +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=BU_sKzSbTJk +#EXTINF:165,Kanye West & Kid Cudi - Feel The Love Ft. Pusha T (Kids See Ghosts) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=XtkW3cuMNfM +#EXTINF:154,Kanye West & Kid Cudi - 4th Dimension ft. Louis Prima (Kids See Ghosts) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=4mfNVlbHQrc +#EXTINF:141,Kanye West & Kid Cudi - Fire (Kids See Ghosts) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=jFLra8GgzY0 +#EXTINF:197,Kanye West & Kid Cudi - Cudi Montage (Kids See Ghost) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=7hd65jvahmA +#EXTINF:207,Kanye West & Kid Cudi - Freeee Ghost Town Pt. 2 (Kids See Ghosts) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=0Nc9n77W42g +#EXTINF:245,Kanye West & Kid Cudi - Kids See Ghosts Ft Yasiin Bey +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=BU_sKzSbTJk +#EXTINF:162,Aries - CAROUSEL (Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=A-5M73ooTB0 +#EXTINF:139,PINK GUY - DUMPLINGS +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=o4SiFAS8d9Y +#EXTINF:202,RICE BALLS +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=LeMVDuIO3J0 +#EXTINF:171,FRIED NOODLES +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Ani_6IRV20A +#EXTINF:189,PINK LIFE +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=b9Wlei7ZV1Y +#EXTINF:75,FRIENDZONE SONG +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=p37_Ux1G_BI +#EXTINF:121,PINK GUY WHITE IS RIGHT de FilthyFrank Subtitulado +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=1FvzMY-zo0Q +#EXTINF:143,PINK GUY - セックス大好き +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=2Pgl-JC2sgk +#EXTINF:163,LiL PEEP x Lil Tracy - Past the Castle Walls [prod. Charlie Shuffler] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=RhxVEtjjeo8 +#EXTINF:198,☆LiL PEEP☆ - LiL Kennedy +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Mu5xpZdYoQ0 +#EXTINF:276,Higher Brothers x Famous Dex - Made In China (Prod. Richie Souf) (Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=OKDgjtmbAxs +#EXTINF:257,Higher Brothers ft. Keith Ape - WeChat (Audio) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=N826CZdkk34 +#EXTINF:307,Keith Ape - 잊지마 (It G Ma) - LYRICS (in the description) (AUDIO) (HD) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=zncdQNyff1A +#EXTINF:102,Kohh - パリ(Paris) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=M9WHVBlMKls +#EXTINF:324,[한글자막M/V] KOHH - Dirt Boys (Feat. Dutch Montana, Loota) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=m-kgV9cutic +#EXTINF:228,Rich Brian - History +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=ltPf3M9UGiM +#EXTINF:179,Joji - TEST DRIVE +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=PEBS2jbZce4 +#EXTINF:178,Josip On Deck - Anime Pu$$y ft. Killa Karisma (Music Video) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=0DW31upNEEg +#EXTINF:289,Attack on Titan - 'So ist es immer' with Lyrics +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=_jqSy8E9JLQ +#EXTINF:267,Attack on Titan - The Reluctant Heroes +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=eFah8TCWOro +#EXTINF:265,The Reluctant Heroes - Shingeki no Kyojin [piano] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=D-gDPh9ZpFk +#EXTINF:178,Josip On Deck - Anime Pu$$y ft. Killa Karisma (Music Video) +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=0DW31upNEEg +#EXTINF:261,Jiyuu no Tsubasa - Shingeki no Kyojin OP2 [piano Duet with Tehishter] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=NqRPg_0Xdqk +#EXTINF:303,Naruto: Shippuden OP16 - Silhouette +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=GlfQDJnfgJE +#EXTINF:228,COLORS - Code Geass OP1 [piano] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=aFzeMMgHaLQ +#EXTINF:379,My Dearest - Guilty Crown OP 1 [Piano] +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=Pi8xsZXibIc +#EXTINF:252,Mobile Suit Gundam 00 OP - Daybreak's Bell +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=zBjE8o70J34 +#EXTINF:276,Ash Like Snow - Opening 2 Gundam 00 + Lyrics +ffmpeg2wav:youtube-dl:https://www.youtube.com/watch?v=_d_for2jnQ0 diff --git a/web/playlist.php b/web/playlist.php index dd3400a..91eed80 100644 --- a/web/playlist.php +++ b/web/playlist.php @@ -7,6 +7,7 @@ $files = scanDir::scan('/playlists/normal', "m3u", false); $files = array_merge($files, scanDir::scan('/playlists/normal/Daniel', "m3u", false)); $files = array_merge($files, scanDir::scan('/playlists/normal/Joakim', "m3u", false)); $files = array_merge($files, scanDir::scan('/playlists/normal/Oskar', "m3u", false)); +$files = array_merge($files, scanDir::scan('/playlists/normal/Cyber', "m3u", false)); $files = array_merge($files, scanDir::scan('/playlists/normal/artists', "m3u", false)); echo "#EXTM3U\n";