OK madebytravisci

debian/video-dl-4.0.23/debian/changelog → debian/video-dl-4.0.25/debian/changelog

@@ -1,3 +1,9 @@
+video-dl (4.0.25) lenny; urgency=low
+
+  * API and web version sync
+
+ -- Daniil Gentili <[email protected]>  Tue, 19 Jan 2016 04:04:01 +0000
+
 video-dl (4.0.23) lenny; urgency=low
 
   * API and web version sync

debian/video-dl-4.0.25/debian/files

@@ -0,0 +1 @@
+video-dl_4.0.25_all.deb misc optional

debian/video-dl-4.0.23/debian/video-dl/DEBIAN/control → debian/video-dl-4.0.25/debian/video-dl/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: video-dl
-Version: 4.0.23
+Version: 4.0.25
 Architecture: all
 Maintainer: Daniil Gentili <[email protected]>
 Installed-Size: 75

debian/video-dl-4.0.23/debian/video-dl/DEBIAN/md5sums → debian/video-dl-4.0.25/debian/video-dl/DEBIAN/md5sums

@@ -1,5 +1,5 @@
-9bc0be64a35561f80b0b5cf00b921f93  usr/bin/video.sh
-6ca1e75944a2b9f6153f5d347f6bcdc6  usr/share/doc/video-dl/changelog.gz
+cc90c20974fa16ba1c9633545634d486  usr/bin/video.sh
+2911b4d7dae926823280fc07cccfd8ec  usr/share/doc/video-dl/changelog.gz
 25c5b4ef5e118bac52b8c766a66145da  usr/share/doc/video-dl/copyright
 76edf2ab86af10ff7fc65b7c13cd89fc  usr/share/man/man1/video-dl-it.1.gz
 7947a2b74b8b4669acefd46fdb0be865  usr/share/man/man1/video-dl.1.gz

debian/video-dl-4.0.23/video-dl/video.sh → debian/video-dl-4.0.25/debian/video-dl/usr/bin/video.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Video download script v4.0.23
+# Video download script v4.0.25
 # Created by Daniil Gentili (http://daniil.it)
 # Video-dl - Video download programs
 #
@@ -28,7 +28,7 @@
 # v3.3.1 Improved the auto update function and player choice
 # v3.3.2 Squashed some other bugs, fixed download of 302 videos on Mac OS X (curl redirection).
 
-echo "Video download script v4.0.23
+echo "Video download script v4.0.25
 Copyright (C) 2016 Daniil Gentili
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
@@ -166,7 +166,7 @@ api() {
  # Get video information
 
  getsize() {
-  minfo="$(timeout -skill 15s mediainfo "$a")"
+  minfo="$(timeout -skill 5s mediainfo "$a")"
   info="($(echo "$(echo "$a" | sed "s/.*\.//;s/[^a-z|0-9].*//"), $(echo "$minfo" | sed '/File size/!d;s/.*:\s//g'), $(echo "$minfo" | sed '/Width\|Height/!d;s/.*:\s//g;s/\spixels//g;s/\s//g;/^\s*$/d' | tr -s "\n" x | sed 's/x$//g')" |
 sed 's/\
 //g;s/^, //g;s/, B,/, Unkown size,/g;s/, ,/,/g;s/^B,//g;s/, $//;s/ $//g'))"
@@ -335,18 +335,20 @@ $u"
 
 
  rai() { 
- saferai="$1"
- # Store the page in a variable
- file=$(wget "$saferai" -q -O -)
-
- # Rai replay or normal rai website choice
- echo "$1" | grep -q 'http://www.*.rai..*/dl/replaytv/replaytv.html.*' && replay "$saferai" || rai_normal "$saferai"
-
- videoTitolo="$(echo -en "$videoTitolo")"
-
- [ "$videoTitolo" = "" ] && videoTitolo=$(echo "$file" | tr '\n' ' ' | sed 's/.*<title>//;s/<\/title>.*//;s/^ //')
- # Resolve relinkers
-  relinker_rai $videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay
+  saferai="$1"
+  # Store the page in a variable
+  file=$(wget "$saferai" -q -O -)
+
+  # Rai replay or normal rai website choice
+  echo "$1" | grep -q 'http://www.*.rai..*/dl/replaytv/replaytv.html.*' && replay "$saferai" || rai_normal "$saferai"
+  links="$videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay"
+  links="$(echo "$links" | sed '/^\s*$/d')"
+  videoTitolo="$(echo -en "$videoTitolo")"
+  [ "$links" = "" ] && replay "$saferai"
+  links="$videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay"
+  [ "$videoTitolo" = "" ] && videoTitolo=$(echo "$file" | tr '\n' ' ' | sed 's/.*<title>//;s/<\/title>.*//;s/^ //')
+  # Resolve relinkers
+  relinker_rai "$links"
  }
 
 
@@ -448,7 +450,7 @@ $(timeout -skill 5s wget "$dl&output=43" -U="" -q -O -)"
    # 2nd method
 
    [ "$base" = "" ] && {
-    base="$(eval echo "$(for f in $(echo "$url" | grep ","); do number="$(echo "$f" | sed 's/http\:\/\///g;s/\/.*//;s/[^0-9]//g')"; echo "$f" | sed 's/.*Italy/Italy/;s/^/http\:\/\/creativemedia'$number'\.rai\.it\//;s/,/{/;s/,\./}\./;s/\.mp4.*/\.mp4/'; done)")" && checkurl
+    base="$(eval echo "$(for f in $(echo "$url" | grep ","); do number="$(echo "$f" | sed 's/http\:\/\///g;s/\/.*//;s/[^0-9]//g;s/^.*\(.\{1\}\)$/\1/')"; echo "$f" | sed 's/.*Italy/Italy/;s/^/http\:\/\/creativemedia'$number'\.rai\.it\//;s/,/{/;s/,\./}\./;s/\.mp4.*/\.mp4/'; done)")" && checkurl
    }
 
 

debian/video-dl-4.0.23/debian/video-dl/usr/bin/video.sh → debian/video-dl-4.0.25/video-dl/video.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Video download script v4.0.23
+# Video download script v4.0.25
 # Created by Daniil Gentili (http://daniil.it)
 # Video-dl - Video download programs
 #
@@ -28,7 +28,7 @@
 # v3.3.1 Improved the auto update function and player choice
 # v3.3.2 Squashed some other bugs, fixed download of 302 videos on Mac OS X (curl redirection).
 
-echo "Video download script v4.0.23
+echo "Video download script v4.0.25
 Copyright (C) 2016 Daniil Gentili
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
@@ -166,7 +166,7 @@ api() {
  # Get video information
 
  getsize() {
-  minfo="$(timeout -skill 15s mediainfo "$a")"
+  minfo="$(timeout -skill 5s mediainfo "$a")"
   info="($(echo "$(echo "$a" | sed "s/.*\.//;s/[^a-z|0-9].*//"), $(echo "$minfo" | sed '/File size/!d;s/.*:\s//g'), $(echo "$minfo" | sed '/Width\|Height/!d;s/.*:\s//g;s/\spixels//g;s/\s//g;/^\s*$/d' | tr -s "\n" x | sed 's/x$//g')" |
 sed 's/\
 //g;s/^, //g;s/, B,/, Unkown size,/g;s/, ,/,/g;s/^B,//g;s/, $//;s/ $//g'))"
@@ -335,18 +335,20 @@ $u"
 
 
  rai() { 
- saferai="$1"
- # Store the page in a variable
- file=$(wget "$saferai" -q -O -)
-
- # Rai replay or normal rai website choice
- echo "$1" | grep -q 'http://www.*.rai..*/dl/replaytv/replaytv.html.*' && replay "$saferai" || rai_normal "$saferai"
-
- videoTitolo="$(echo -en "$videoTitolo")"
-
- [ "$videoTitolo" = "" ] && videoTitolo=$(echo "$file" | tr '\n' ' ' | sed 's/.*<title>//;s/<\/title>.*//;s/^ //')
- # Resolve relinkers
-  relinker_rai $videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay
+  saferai="$1"
+  # Store the page in a variable
+  file=$(wget "$saferai" -q -O -)
+
+  # Rai replay or normal rai website choice
+  echo "$1" | grep -q 'http://www.*.rai..*/dl/replaytv/replaytv.html.*' && replay "$saferai" || rai_normal "$saferai"
+  links="$videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay"
+  links="$(echo "$links" | sed '/^\s*$/d')"
+  videoTitolo="$(echo -en "$videoTitolo")"
+  [ "$links" = "" ] && replay "$saferai"
+  links="$videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay"
+  [ "$videoTitolo" = "" ] && videoTitolo=$(echo "$file" | tr '\n' ' ' | sed 's/.*<title>//;s/<\/title>.*//;s/^ //')
+  # Resolve relinkers
+  relinker_rai "$links"
  }
 
 
@@ -448,7 +450,7 @@ $(timeout -skill 5s wget "$dl&output=43" -U="" -q -O -)"
    # 2nd method
 
    [ "$base" = "" ] && {
-    base="$(eval echo "$(for f in $(echo "$url" | grep ","); do number="$(echo "$f" | sed 's/http\:\/\///g;s/\/.*//;s/[^0-9]//g')"; echo "$f" | sed 's/.*Italy/Italy/;s/^/http\:\/\/creativemedia'$number'\.rai\.it\//;s/,/{/;s/,\./}\./;s/\.mp4.*/\.mp4/'; done)")" && checkurl
+    base="$(eval echo "$(for f in $(echo "$url" | grep ","); do number="$(echo "$f" | sed 's/http\:\/\///g;s/\/.*//;s/[^0-9]//g;s/^.*\(.\{1\}\)$/\1/')"; echo "$f" | sed 's/.*Italy/Italy/;s/^/http\:\/\/creativemedia'$number'\.rai\.it\//;s/,/{/;s/,\./}\./;s/\.mp4.*/\.mp4/'; done)")" && checkurl
    }
 
 

debian/video-dl_4.0.25.dsc

@@ -0,0 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+Format: 3.0 (native)
+Source: video-dl
+Binary: video-dl
+Architecture: all
+Version: 4.0.25
+Maintainer: Daniil Gentili <[email protected]>
+Homepage: http://daniil.it/video-dl
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 8.0.0)
+Package-List: 
+ video-dl deb misc optional
+Checksums-Sha1: 
+ c51f4a730efced6d304079629960d37c44e7c0b2 19470 video-dl_4.0.25.tar.gz
+Checksums-Sha256: 
+ 955d1b8da80382dd0670db79868bc96a76bbb3448f9818e1d678cabe0c5a7ee7 19470 video-dl_4.0.25.tar.gz
+Files: 
+ 7864917cff9f186d58ffef0ad72ed67e 19470 video-dl_4.0.25.tar.gz
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAEBAgAGBQJWnbWzAAoJEHK5f9HZZyyTH6sQAIl5DWSn4Zoe5xJkbYUyOa4e
+3OhEOSa+YptRpruufrnr7uahumM9fXozC2sLaD90KMNGLJikTGxmqM+eow5Fph8d
+EHr1daOqS2a2PVCiBwPIDzjYPN7waF3c000JaN2wqBEtcQ/VbV8j4on1byk18BTZ
+f4vbrk5Nxp95oG1/syUjyaFTiKPRQZGX5gootHhd0usEOmoH2ifAuqgPPf2kCvRr
+/8pjZuq5TtZsu0IAh5lXIy2B83WNjCuryz1bzgDnFFlTt8yzn+0BUc60HtSP9Y9w
+ZhUKoYe9/Sek7ADwdRi7aDFMiMAk6k+fBh2T1u6HDfdk7LeCOqqouHJB/7bTOWEC
+m7OQgvsQgZecC7DIV27PpjAIv33bhWoARRElqast4ZvoFL/SCITQSq6HIlQSC7tn
+X+QV79dYu32s5pQ/+Tb2fTO/PnRHmN0XzpjbqJV10QvvkN5uP1QopqXjp2Jwosle
+OXzhswWRuW86YMD6mLqrgk86mz/XCUDK7d5/ZwY74ZACE17Fvf7EJyagPa7suUzo
+4ornDxFmeLYqDLLQvLrIzlf4J6Lx7Bc9Qn3judDvDfkjKfgJsanUWHz0fv0TPXHp
+ere8n5I9i1DThNWOEy0NvBuC+UcBxAHchkXpqwRb/WRHkoUTOFj5QVLZHpOZpJBV
+ccHXr3GwCqqUWgBeL/sm
+=nmHQ
+-----END PGP SIGNATURE-----

debian/video-dl_4.0.25_amd64.changes

@@ -0,0 +1,28 @@
+Format: 1.8
+Date: Tue, 19 Jan 2016 04:04:01 +0000
+Source: video-dl
+Binary: video-dl
+Architecture: source all
+Version: 4.0.25
+Distribution: lenny
+Urgency: low
+Maintainer: Daniil Gentili <[email protected]>
+Changed-By: Daniil Gentili <[email protected]>
+Description: 
+ video-dl   - Video Download script
+Changes: 
+ video-dl (4.0.25) lenny; urgency=low
+ .
+   * API and web version sync
+Checksums-Sha1: 
+ 3b67d25dc77c4c81e82ac04969cb24d7ca3f146a 1443 video-dl_4.0.25.dsc
+ c51f4a730efced6d304079629960d37c44e7c0b2 19470 video-dl_4.0.25.tar.gz
+ 8d5b007676ef9bcf1f8af93d31d977d03574d32e 23148 video-dl_4.0.25_all.deb
+Checksums-Sha256: 
+ d7f5f15094cd076a054d1320646915d995425cfe02c5496e31ebcbc4bdc18eb2 1443 video-dl_4.0.25.dsc
+ 955d1b8da80382dd0670db79868bc96a76bbb3448f9818e1d678cabe0c5a7ee7 19470 video-dl_4.0.25.tar.gz
+ 65817913cdc528a5abca00c99a263e7142be145b71e0db6461bee453c10fc1d9 23148 video-dl_4.0.25_all.deb
+Files: 
+ 5768383dc2e4a635fcf43e39f2d820ef 1443 misc optional video-dl_4.0.25.dsc
+ 7864917cff9f186d58ffef0ad72ed67e 19470 misc optional video-dl_4.0.25.tar.gz
+ b6351e4b78dead39d944a546d07bba7f 23148 misc optional video-dl_4.0.25_all.deb

jquery/package.json

@@ -1,6 +1,6 @@
 {
   "name": "video-dl",
-  "version": "4.0.15",
+  "version": "4.0.25",
   "description": "Script to Download videos from youtube, rai.tv, mediaset, la7 and hundreds of other sites",
   "main": "video-dl.js",
   "scripts": {

video.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Video download script v4.0.23
+# Video download script v4.0.25
 # Created by Daniil Gentili (http://daniil.it)
 # Video-dl - Video download programs
 #
@@ -28,7 +28,7 @@
 # v3.3.1 Improved the auto update function and player choice
 # v3.3.2 Squashed some other bugs, fixed download of 302 videos on Mac OS X (curl redirection).
 
-echo "Video download script v4.0.23
+echo "Video download script v4.0.25
 Copyright (C) 2016 Daniil Gentili
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
@@ -166,7 +166,7 @@ api() {
  # Get video information
 
  getsize() {
-  minfo="$(timeout -skill 15s mediainfo "$a")"
+  minfo="$(timeout -skill 5s mediainfo "$a")"
   info="($(echo "$(echo "$a" | sed "s/.*\.//;s/[^a-z|0-9].*//"), $(echo "$minfo" | sed '/File size/!d;s/.*:\s//g'), $(echo "$minfo" | sed '/Width\|Height/!d;s/.*:\s//g;s/\spixels//g;s/\s//g;/^\s*$/d' | tr -s "\n" x | sed 's/x$//g')" |
 sed 's/\
 //g;s/^, //g;s/, B,/, Unkown size,/g;s/, ,/,/g;s/^B,//g;s/, $//;s/ $//g'))"
@@ -335,18 +335,20 @@ $u"
 
 
  rai() { 
- saferai="$1"
- # Store the page in a variable
- file=$(wget "$saferai" -q -O -)
-
- # Rai replay or normal rai website choice
- echo "$1" | grep -q 'http://www.*.rai..*/dl/replaytv/replaytv.html.*' && replay "$saferai" || rai_normal "$saferai"
-
- videoTitolo="$(echo -en "$videoTitolo")"
-
- [ "$videoTitolo" = "" ] && videoTitolo=$(echo "$file" | tr '\n' ' ' | sed 's/.*<title>//;s/<\/title>.*//;s/^ //')
- # Resolve relinkers
-  relinker_rai $videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay
+  saferai="$1"
+  # Store the page in a variable
+  file=$(wget "$saferai" -q -O -)
+
+  # Rai replay or normal rai website choice
+  echo "$1" | grep -q 'http://www.*.rai..*/dl/replaytv/replaytv.html.*' && replay "$saferai" || rai_normal "$saferai"
+  links="$videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay"
+  links="$(echo "$links" | sed '/^\s*$/d')"
+  videoTitolo="$(echo -en "$videoTitolo")"
+  [ "$links" = "" ] && replay "$saferai"
+  links="$videoURL_M3U8 $videoURL_MP4 $videoURL_H264 $videoURL_WMV $videoURL $replay"
+  [ "$videoTitolo" = "" ] && videoTitolo=$(echo "$file" | tr '\n' ' ' | sed 's/.*<title>//;s/<\/title>.*//;s/^ //')
+  # Resolve relinkers
+  relinker_rai "$links"
  }
 
 
@@ -448,7 +450,7 @@ $(timeout -skill 5s wget "$dl&output=43" -U="" -q -O -)"
    # 2nd method
 
    [ "$base" = "" ] && {
-    base="$(eval echo "$(for f in $(echo "$url" | grep ","); do number="$(echo "$f" | sed 's/http\:\/\///g;s/\/.*//;s/[^0-9]//g')"; echo "$f" | sed 's/.*Italy/Italy/;s/^/http\:\/\/creativemedia'$number'\.rai\.it\//;s/,/{/;s/,\./}\./;s/\.mp4.*/\.mp4/'; done)")" && checkurl
+    base="$(eval echo "$(for f in $(echo "$url" | grep ","); do number="$(echo "$f" | sed 's/http\:\/\///g;s/\/.*//;s/[^0-9]//g;s/^.*\(.\{1\}\)$/\1/')"; echo "$f" | sed 's/.*Italy/Italy/;s/^/http\:\/\/creativemedia'$number'\.rai\.it\//;s/,/{/;s/,\./}\./;s/\.mp4.*/\.mp4/'; done)")" && checkurl
    }