nemunaire/musik
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update ytd and fix max size check

Browse Source
This commit is contained in:
Némunaire 2012-10-23 18:09:06 +02:00
parent f8d59cca32
commit 5210a4d188
3 changed files with 4 additions and 4725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.php
View File

@ -65,6 +65,8 @@ function add_url($user, $url)
if ( if (
preg_match("#^http://(www.)?youtube.com/watch\?v=([a-zA-Z0-9_-]+)#", preg_match("#^http://(www.)?youtube.com/watch\?v=([a-zA-Z0-9_-]+)#",
$url, $matched) $url, $matched)
|| preg_match("#^http://(www.)?youtube.com/playlist\?list=([a-zA-Z0-9_-]+)#",
$url, $matched)
|| preg_match("#^http://youtu.be/([a-zA-Z0-9_-]+)#", || preg_match("#^http://youtu.be/([a-zA-Z0-9_-]+)#",
$url, $matched) $url, $matched)
|| preg_match("#^http://(www.)?dailymotion.com/video/([a-zA-Z0-9_-]+)#", || preg_match("#^http://(www.)?dailymotion.com/video/([a-zA-Z0-9_-]+)#",

2
dl.sh
View File

@ -23,7 +23,7 @@ if [ ! -e /tmp/dlEnCours ]; then
echo "-- " >> $f.done echo "-- " >> $f.done
transmission-remote -AS transmission-remote -AS
else else
size=`$pwd/youtube-dl --skip-download http://www.youtube.com/watch?v=nh_hs-8_zF4 | grep "File size"` size=`$pwd/youtube-dl --skip-download "$lign" | grep "File size"`
if echo $size | grep -E " [1234]?[0-9]{2}\.[0-9]+M " if echo $size | grep -E " [1234]?[0-9]{2}\.[0-9]+M "
then then
echo "$lign" >> $pwd/database echo "$lign" >> $pwd/database

4724
youtube-dl
View File

File diff suppressed because it is too large Load Diff

1
youtube-dl Symbolic link
View File

@ -0,0 +1 @@
yt-dl/youtube-dl