diff -Nru movgrab-1.1.14/CHANGES movgrab-1.1.15/CHANGES --- movgrab-1.1.14/CHANGES 2012-12-04 08:49:21.000000000 +0000 +++ movgrab-1.1.15/CHANGES 2012-12-30 14:46:11.000000000 +0000 @@ -1,9 +1,11 @@ -Version 1.1.14 - Large file support added (files > 2G). Thanks to Mattias B for bug report - Animehere added - Escapist Magazine broken again. No 'Zero Punctuation' anymore :-( - Fixed 3gp downloads. Thanks to Deeice for bug report +Version 1.1.15 + Added a basic 'ETA' meter (bounces around a lot depending on speed of download) + Added support form links from google-video search + Fixed dailymotion titles +Version 1.1.14 + Largefile (> 2GB) support + Added 'Animehere' website Version 1.1.13 Fixed Academic Earth. diff -Nru movgrab-1.1.14/Makefile movgrab-1.1.15/Makefile --- movgrab-1.1.14/Makefile 2012-12-04 07:34:43.000000000 +0000 +++ movgrab-1.1.15/Makefile 2012-12-30 14:43:17.000000000 +0000 @@ -1,12 +1,12 @@ CC = gcc -VERSION = 1.1.14 +VERSION = 1.1.15 CFLAGS = -g -O2 -LIBS = -lz +LIBS = -lcrypto -lssl -lz INSTALL=/bin/install -c prefix=/usr/local bindir=$(prefix)${exec_prefix}/bin DESTDIR= -FLAGS=$(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 +FLAGS=$(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 OBJ=containerfiles.o outputfiles.o common.o cbsnews.o dailymotion.o ehow.o youtube.o servicetypes.o extract_text.o download.o all: $(OBJ) diff -Nru movgrab-1.1.14/common.h movgrab-1.1.15/common.h --- movgrab-1.1.14/common.h 2012-12-04 07:34:44.000000000 +0000 +++ movgrab-1.1.15/common.h 2012-12-30 14:43:17.000000000 +0000 @@ -2,7 +2,7 @@ #ifndef MOVGRAB_COMMON #define MOVGRAB_COMMON //This is doable through autoconf, but I'm sick of fighting with it -#define Version "1.1.14" +#define Version "1.1.15" #include "libUseful-2.0/libUseful.h" #include diff -Nru movgrab-1.1.14/config.log movgrab-1.1.15/config.log --- movgrab-1.1.14/config.log 2012-12-04 07:34:44.000000000 +0000 +++ movgrab-1.1.15/config.log 2012-12-30 14:43:17.000000000 +0000 @@ -4,7 +4,7 @@ It was created by configure, which was generated by GNU Autoconf 2.60. Invocation command line was - $ ./configure --enable-largefiles + $ ./configure --enable-ssl ## --------- ## ## Platform. ## @@ -29,7 +29,6 @@ PATH: /bin PATH: /usr/bin -PATH: /usr/X11R6/bin ## ----------- ## @@ -163,6 +162,22 @@ configure:3458: test -s conftest configure:3461: $? = 0 configure:3475: result: yes +configure:3514: checking for SSL_library_init in -lssl +configure:3549: gcc -o conftest -g -O2 conftest.c -lssl -lz >&5 +configure:3555: $? = 0 +configure:3562: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3565: $? = 0 +configure:3572: test -s conftest +configure:3575: $? = 0 +configure:3589: result: yes +configure:3603: checking for EVP_CIPHER_CTX_init in -lcrypto +configure:3638: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3644: $? = 0 +configure:3651: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3654: $? = 0 +configure:3661: test -s conftest +configure:3664: $? = 0 +configure:3678: result: yes configure:3825: creating ./config.status ## ---------------------- ## @@ -181,8 +196,8 @@ on evo config.status:568: creating Makefile -configure:4758: === configuring in libUseful-2.0 (/home/meta/movgrab-1.1.14/libUseful-2.0) -configure:4861: running /bin/sh ./configure --prefix=/usr/local '--enable-largefiles' --cache-file=/dev/null --srcdir=. +configure:4758: === configuring in libUseful-2.0 (/home/meta/movgrab-1.1.15/libUseful-2.0) +configure:4861: running /bin/sh ./configure --prefix=/usr/local '--enable-ssl' --cache-file=/dev/null --srcdir=. ## ---------------- ## ## Cache variables. ## @@ -206,6 +221,8 @@ ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= ac_cv_header_stdc=yes +ac_cv_lib_crypto_EVP_CIPHER_CTX_init=yes +ac_cv_lib_ssl_SSL_library_init=yes ac_cv_lib_z_deflate=yes ac_cv_objext=o ac_cv_path_EGREP='/usr/bin/grep -E' @@ -225,7 +242,7 @@ CFLAGS='-g -O2' CPP='gcc -E' CPPFLAGS='' -DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64' +DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1' ECHO_C='ECHO_N='' ECHO_T='' EGREP='/usr/bin/grep -E' @@ -236,7 +253,7 @@ INSTALL_SCRIPT='${INSTALL}' LDFLAGS='' LIBOBJS='' -LIBS='-lz ' +LIBS='-lcrypto -lssl -lz ' LTLIBOBJS='' OBJEXT='o' PACKAGE_BUGREPORT='' @@ -247,7 +264,7 @@ PATH_SEPARATOR=':' SET_MAKE='' SHELL='/bin/sh' -VERSION='1.1.14' +VERSION='1.1.15' ac_ct_CC='gcc' bindir='${exec_prefix}/bin' build_alias='' @@ -287,7 +304,7 @@ #define PACKAGE_BUGREPORT "" #define STDC_HEADERS 1 #define HAVE_LIBZ 1 -#define _LARGEFILE64_SOURCE 1 -#define _FILE_OFFSET_BITS 64 +#define HAVE_LIBSSL 1 +#define HAVE_LIBCRYPTO 1 configure: exit 0 diff -Nru movgrab-1.1.14/config.status movgrab-1.1.15/config.status --- movgrab-1.1.14/config.status 2012-12-04 07:34:44.000000000 +0000 +++ movgrab-1.1.15/config.status 2012-12-30 14:43:17.000000000 +0000 @@ -312,13 +312,13 @@ ac_cs_version="\ config.status configured by ./configure, generated by GNU Autoconf 2.60, - with options \"'--enable-largefiles'\" + with options \"'--enable-ssl'\" Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/meta/movgrab-1.1.14' +ac_pwd='/home/meta/movgrab-1.1.15' srcdir='.' INSTALL='/bin/install -c' # If no file are specified by the user, then we need to provide default @@ -377,10 +377,10 @@ fi if $ac_cs_recheck; then - echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--enable-largefiles' $ac_configure_extra_args " --no-create --no-recursion" >&6 + echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--enable-ssl' $ac_configure_extra_args " --no-create --no-recursion" >&6 CONFIG_SHELL=/bin/sh export CONFIG_SHELL - exec /bin/sh "./configure" '--enable-largefiles' $ac_configure_extra_args --no-create --no-recursion + exec /bin/sh "./configure" '--enable-ssl' $ac_configure_extra_args --no-create --no-recursion fi exec 5>>config.log @@ -482,15 +482,15 @@ s,@libdir@,|#_!!_#|${exec_prefix}/lib,g s,@localedir@,|#_!!_#|${datarootdir}/locale,g s,@mandir@,|#_!!_#|${datarootdir}/man,g -s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"\\" -DPACKAGE_TARNAME=\\"\\" -DPACKAGE_VERSION=\\"\\" -DPACKAGE_STRING=\\"\\" -DPACKAGE_BUGREPORT=\\"\\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64,g +s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"\\" -DPACKAGE_TARNAME=\\"\\" -DPACKAGE_VERSION=\\"\\" -DPACKAGE_STRING=\\"\\" -DPACKAGE_BUGREPORT=\\"\\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1,g s,@ECHO_C@,|#_!!_#|\\c,g s,@ECHO_N@,|#_!!_#|,g s,@ECHO_T@,|#_!!_#|,g -s,@LIBS@,|#_!!_#|-lz ,g +s,@LIBS@,|#_!!_#|-lcrypto -lssl -lz ,g s,@build_alias@,|#_!!_#|,g s,@host_alias@,|#_!!_#|,g s,@target_alias@,|#_!!_#|,g -s,@VERSION@,|#_!!_#|1.1.14,g +s,@VERSION@,|#_!!_#|1.1.15,g s,@subdirs@,|#_!!_#| libUseful-2.0,g s,@CC@,|#_!!_#|gcc,g s,@CFLAGS@,|#_!!_#|-g -O2,g diff -Nru movgrab-1.1.14/configure movgrab-1.1.15/configure --- movgrab-1.1.14/configure 2012-12-04 07:34:44.000000000 +0000 +++ movgrab-1.1.15/configure 2012-12-30 14:43:17.000000000 +0000 @@ -1629,7 +1629,7 @@ -VERSION="1.1.14" +VERSION="1.1.15" ac_aux_dir= diff -Nru movgrab-1.1.14/configure.in movgrab-1.1.15/configure.in --- movgrab-1.1.14/configure.in 2012-12-04 07:34:44.000000000 +0000 +++ movgrab-1.1.15/configure.in 2012-12-30 14:43:17.000000000 +0000 @@ -2,7 +2,7 @@ AC_INIT([main.c]) -VERSION="1.1.14" +VERSION="1.1.15" AC_SUBST(VERSION) AC_CONFIG_SUBDIRS([libUseful-2.0]) diff -Nru movgrab-1.1.14/debian/changelog movgrab-1.1.15/debian/changelog --- movgrab-1.1.14/debian/changelog 2012-12-05 13:19:05.000000000 +0000 +++ movgrab-1.1.15/debian/changelog 2013-01-27 15:45:56.000000000 +0000 @@ -1,8 +1,14 @@ -movgrab (1.1.14-1~webupd8~precise) precise; urgency=medium +movgrab (1.1.15-1~webupd8~precise) precise; urgency=medium + + * New upstream release: Added basic ETA meter, added support for google video search links, fixed dailymotion titles + + -- Alin Andrei Sun, 27 Jan 2013 17:45:56 +0200 + +movgrab (1.1.14-1~webupd8~raring) raring; urgency=medium * new upstream release - -- Alin Andrei Wed, 05 Dec 2012 15:19:05 +0200 + -- Alin Andrei Wed, 05 Dec 2012 15:18:54 +0200 movgrab (1.1.13-1~webupd8~lucid) lucid; urgency=medium diff -Nru movgrab-1.1.14/download.c movgrab-1.1.15/download.c --- movgrab-1.1.14/download.c 2012-12-04 07:34:44.000000000 +0000 +++ movgrab-1.1.15/download.c 2012-12-30 14:39:37.000000000 +0000 @@ -117,8 +117,8 @@ //Display progress of download void DisplayProgress(char *FullTitle, char *Format, double bytes_read, double DocSize,time_t Now, int PrintName) { -double Percent, Bps=0; -char *HUDocSize=NULL, *BpsStr=NULL, *Title=NULL; +double Percent, Bps=0, ETAsecs; +char *HUDocSize=NULL, *BpsStr=NULL, *ETAStr=NULL, *Title=NULL; static time_t SpeedStart=0; static double PrevBytesRead=0; @@ -149,7 +149,20 @@ Percent=bytes_read * 100.0 / DocSize; - if (! (Flags & FLAG_QUIET)) fprintf(stderr," Progress: %0.2f%% %s of %s %s \r",Percent,GetHumanReadableDataQty(bytes_read,0),HUDocSize,BpsStr); + if (! (Flags & FLAG_QUIET)) + { + if (bytes_read > 0) + { + ETAsecs=(DocSize-bytes_read) / Bps; + ETAStr=FormatStr(ETAStr,"%d:%02d",(int) ETAsecs/60, (int) ETAsecs % 60); + } + else ETAStr=CopyStr(ETAStr,"??:??"); + + fprintf(stderr," Progress: %0.2f%% %s of %s %s ETA: %s \r",Percent,GetHumanReadableDataQty(bytes_read,0),HUDocSize,BpsStr,ETAStr); + + } + + sprintf(CmdLine,"%s %0.2f%% %s \0",ProgName,Percent,Title); if ((PlayerPid==0) && (Percent > PlayerLaunchPercent) && (Player)) LaunchPlayer(); Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/.Hash.h.swp and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/.Hash.h.swp differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/Compression.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/Compression.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/ConnectManager.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/ConnectManager.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/DataProcessing.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/DataProcessing.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/EncryptedFiles.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/EncryptedFiles.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/GeneralFunctions.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/GeneralFunctions.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/Hash.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/Hash.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/Log.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/Log.o differ diff -Nru movgrab-1.1.14/libUseful-2.0/Makefile movgrab-1.1.15/libUseful-2.0/Makefile --- movgrab-1.1.14/libUseful-2.0/Makefile 2012-12-04 07:34:45.000000000 +0000 +++ movgrab-1.1.15/libUseful-2.0/Makefile 2012-12-30 01:04:17.000000000 +0000 @@ -1,8 +1,8 @@ CC = gcc VERSION = 0.0.1 CFLAGS = -g -O2 -LIBS = -lz -FLAGS=$(CFLAGS) -fPIC -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1 +LIBS = -lcrypto -lssl -lz +FLAGS=$(CFLAGS) -fPIC -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 -DHAVE_EVP_BF_CBC=1 -DHAVE_EVP_RC2_CBC=1 -DHAVE_EVP_RC4=1 -DHAVE_EVP_DES_CBC=1 -DHAVE_EVP_DESX_CBC=1 -DHAVE_EVP_CAST5_CBC=1 -DHAVE_EVP_IDEA_CBC=1 -DHAVE_EVP_AES_128_CBC=1 -DHAVE_EVP_AES_256_CBC=1 -DUSE_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1 prefix=/usr/local OBJ=string.o list.o socket.o unix_socket.o file.o GeneralFunctions.o DataProcessing.o EncryptedFiles.o ConnectManager.o sound.o pty.o Log.o http.o inet.o expect.o base64.o crc32.o md5c.o sha1.o sha2.o Hash.o Compression.o oauth.o libsettings.o Vars.o Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/Vars.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/Vars.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/base64.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/base64.o differ diff -Nru movgrab-1.1.14/libUseful-2.0/config.log movgrab-1.1.15/libUseful-2.0/config.log --- movgrab-1.1.14/libUseful-2.0/config.log 2012-12-04 07:34:46.000000000 +0000 +++ movgrab-1.1.15/libUseful-2.0/config.log 2012-12-30 01:04:17.000000000 +0000 @@ -4,7 +4,7 @@ It was created by configure, which was generated by GNU Autoconf 2.60. Invocation command line was - $ ./configure --prefix=/usr/local --enable-largefiles --cache-file=/dev/null --srcdir=. + $ ./configure --prefix=/usr/local --enable-ssl --cache-file=/dev/null --srcdir=. ## --------- ## ## Platform. ## @@ -29,7 +29,6 @@ PATH: /bin PATH: /usr/bin -PATH: /usr/X11R6/bin ## ----------- ## @@ -161,6 +160,213 @@ configure:3384: test -s conftest configure:3387: $? = 0 configure:3401: result: yes +configure:3442: checking for SSL_library_init in -lssl +configure:3477: gcc -o conftest -g -O2 conftest.c -lssl -lz >&5 +configure:3483: $? = 0 +configure:3490: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3493: $? = 0 +configure:3500: test -s conftest +configure:3503: $? = 0 +configure:3517: result: yes +configure:3531: checking for EVP_CIPHER_CTX_init in -lcrypto +configure:3566: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3572: $? = 0 +configure:3579: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3582: $? = 0 +configure:3589: test -s conftest +configure:3592: $? = 0 +configure:3606: result: yes +configure:3633: checking for OpenSSL_add_all_algorithms +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +/tmp/ccqpxYPi.o: In function `main': +/home/meta/movgrab-1.1.14/libUseful-2.0/conftest.c:46: undefined reference to `OpenSSL_add_all_algorithms' +collect2: ld returned 1 exit status +configure:3695: $? = 1 +configure: failed program was: +| /* confdefs.h. */ +| #define PACKAGE_NAME "" +| #define PACKAGE_TARNAME "" +| #define PACKAGE_VERSION "" +| #define PACKAGE_STRING "" +| #define PACKAGE_BUGREPORT "" +| #define STDC_HEADERS 1 +| #define HAVE_LIBZ 1 +| #define HAVE_LIBSSL 1 +| #define HAVE_LIBCRYPTO 1 +| /* end confdefs.h. */ +| /* Define OpenSSL_add_all_algorithms to an innocuous variant, in case declares OpenSSL_add_all_algorithms. +| For example, HP-UX 11i declares gettimeofday. */ +| #define OpenSSL_add_all_algorithms innocuous_OpenSSL_add_all_algorithms +| +| /* System header to define __stub macros and hopefully few prototypes, +| which can conflict with char OpenSSL_add_all_algorithms (); below. +| Prefer to if __STDC__ is defined, since +| exists even on freestanding compilers. */ +| +| #ifdef __STDC__ +| # include +| #else +| # include +| #endif +| +| #undef OpenSSL_add_all_algorithms +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char OpenSSL_add_all_algorithms (); +| /* The GNU C library defines this for functions which it implements +| to always fail with ENOSYS. Some functions are actually named +| something starting with __ and the normal name is an alias. */ +| #if defined __stub_OpenSSL_add_all_algorithms || defined __stub___OpenSSL_add_all_algorithms +| choke me +| #endif +| +| int +| main () +| { +| return OpenSSL_add_all_algorithms (); +| ; +| return 0; +| } +configure:3729: result: no +configure:3633: checking for EVP_bf_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_rc2_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_rc4 +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_rc5_32_12_16_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +/tmp/ccWu1BtX.o: In function `main': +/home/meta/movgrab-1.1.14/libUseful-2.0/conftest.c:49: undefined reference to `EVP_rc5_32_12_16_cbc' +collect2: ld returned 1 exit status +configure:3695: $? = 1 +configure: failed program was: +| /* confdefs.h. */ +| #define PACKAGE_NAME "" +| #define PACKAGE_TARNAME "" +| #define PACKAGE_VERSION "" +| #define PACKAGE_STRING "" +| #define PACKAGE_BUGREPORT "" +| #define STDC_HEADERS 1 +| #define HAVE_LIBZ 1 +| #define HAVE_LIBSSL 1 +| #define HAVE_LIBCRYPTO 1 +| #define HAVE_EVP_BF_CBC 1 +| #define HAVE_EVP_RC2_CBC 1 +| #define HAVE_EVP_RC4 1 +| /* end confdefs.h. */ +| /* Define EVP_rc5_32_12_16_cbc to an innocuous variant, in case declares EVP_rc5_32_12_16_cbc. +| For example, HP-UX 11i declares gettimeofday. */ +| #define EVP_rc5_32_12_16_cbc innocuous_EVP_rc5_32_12_16_cbc +| +| /* System header to define __stub macros and hopefully few prototypes, +| which can conflict with char EVP_rc5_32_12_16_cbc (); below. +| Prefer to if __STDC__ is defined, since +| exists even on freestanding compilers. */ +| +| #ifdef __STDC__ +| # include +| #else +| # include +| #endif +| +| #undef EVP_rc5_32_12_16_cbc +| +| /* Override any GCC internal prototype to avoid an error. +| Use char because int might match the return type of a GCC +| builtin and then its argument prototype would still apply. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| char EVP_rc5_32_12_16_cbc (); +| /* The GNU C library defines this for functions which it implements +| to always fail with ENOSYS. Some functions are actually named +| something starting with __ and the normal name is an alias. */ +| #if defined __stub_EVP_rc5_32_12_16_cbc || defined __stub___EVP_rc5_32_12_16_cbc +| choke me +| #endif +| +| int +| main () +| { +| return EVP_rc5_32_12_16_cbc (); +| ; +| return 0; +| } +configure:3729: result: no +configure:3633: checking for EVP_des_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_desx_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_cast5_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_idea_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_aes_128_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3633: checking for EVP_aes_256_cbc +configure:3689: gcc -o conftest -g -O2 conftest.c -lcrypto -lssl -lz >&5 +configure:3695: $? = 0 +configure:3702: test -z "$ac_c_werror_flag" || test ! -s conftest.err +configure:3705: $? = 0 +configure:3712: test -s conftest +configure:3715: $? = 0 +configure:3729: result: yes +configure:3740: checking that OpenSSL Library is at least version 0.9.7 +configure:3758: result: yes configure:3799: checking for sys/types.h configure:3820: gcc -c -g -O2 conftest.c >&5 configure:3826: $? = 0 @@ -287,6 +493,17 @@ ac_cv_env_host_alias_value= ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= +ac_cv_func_EVP_aes_128_cbc=yes +ac_cv_func_EVP_aes_256_cbc=yes +ac_cv_func_EVP_bf_cbc=yes +ac_cv_func_EVP_cast5_cbc=yes +ac_cv_func_EVP_des_cbc=yes +ac_cv_func_EVP_desx_cbc=yes +ac_cv_func_EVP_idea_cbc=yes +ac_cv_func_EVP_rc2_cbc=yes +ac_cv_func_EVP_rc4=yes +ac_cv_func_EVP_rc5_32_12_16_cbc=no +ac_cv_func_OpenSSL_add_all_algorithms=no ac_cv_header_inttypes_h=yes ac_cv_header_memory_h=yes ac_cv_header_stdc=yes @@ -298,6 +515,8 @@ ac_cv_header_sys_stat_h=yes ac_cv_header_sys_types_h=yes ac_cv_header_unistd_h=yes +ac_cv_lib_crypto_EVP_CIPHER_CTX_init=yes +ac_cv_lib_ssl_SSL_library_init=yes ac_cv_lib_z_deflate=yes ac_cv_objext=o ac_cv_path_EGREP='/usr/bin/grep -E' @@ -316,7 +535,7 @@ CFLAGS='-g -O2' CPP='gcc -E' CPPFLAGS='' -DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1' +DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 -DHAVE_EVP_BF_CBC=1 -DHAVE_EVP_RC2_CBC=1 -DHAVE_EVP_RC4=1 -DHAVE_EVP_DES_CBC=1 -DHAVE_EVP_DESX_CBC=1 -DHAVE_EVP_CAST5_CBC=1 -DHAVE_EVP_IDEA_CBC=1 -DHAVE_EVP_AES_128_CBC=1 -DHAVE_EVP_AES_256_CBC=1 -DUSE_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1' ECHO_C='ECHO_N='' ECHO_T='' EGREP='/usr/bin/grep -E' @@ -324,7 +543,7 @@ GREP='/usr/bin/grep' LDFLAGS='' LIBOBJS='' -LIBS='-lz ' +LIBS='-lcrypto -lssl -lz ' LTLIBOBJS='' OBJEXT='o' PACKAGE_BUGREPORT='' @@ -374,8 +593,18 @@ #define PACKAGE_BUGREPORT "" #define STDC_HEADERS 1 #define HAVE_LIBZ 1 -#define _LARGEFILE64_SOURCE 1 -#define _FILE_OFFSET_BITS 64 +#define HAVE_LIBSSL 1 +#define HAVE_LIBCRYPTO 1 +#define HAVE_EVP_BF_CBC 1 +#define HAVE_EVP_RC2_CBC 1 +#define HAVE_EVP_RC4 1 +#define HAVE_EVP_DES_CBC 1 +#define HAVE_EVP_DESX_CBC 1 +#define HAVE_EVP_CAST5_CBC 1 +#define HAVE_EVP_IDEA_CBC 1 +#define HAVE_EVP_AES_128_CBC 1 +#define HAVE_EVP_AES_256_CBC 1 +#define USE_OPENSSL_ADD_ALL_ALGORITHMS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 #define HAVE_STDLIB_H 1 diff -Nru movgrab-1.1.14/libUseful-2.0/config.status movgrab-1.1.15/libUseful-2.0/config.status --- movgrab-1.1.14/libUseful-2.0/config.status 2012-12-04 07:34:46.000000000 +0000 +++ movgrab-1.1.15/libUseful-2.0/config.status 2012-12-30 01:04:17.000000000 +0000 @@ -312,7 +312,7 @@ ac_cs_version="\ config.status configured by ./configure, generated by GNU Autoconf 2.60, - with options \"'--prefix=/usr/local' '--enable-largefiles' '--cache-file=/dev/null' '--srcdir=.'\" + with options \"'--prefix=/usr/local' '--enable-ssl' '--cache-file=/dev/null' '--srcdir=.'\" Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -376,10 +376,10 @@ fi if $ac_cs_recheck; then - echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/usr/local' '--enable-largefiles' '--cache-file=/dev/null' '--srcdir=.' $ac_configure_extra_args " --no-create --no-recursion" >&6 + echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/usr/local' '--enable-ssl' '--cache-file=/dev/null' '--srcdir=.' $ac_configure_extra_args " --no-create --no-recursion" >&6 CONFIG_SHELL=/bin/sh export CONFIG_SHELL - exec /bin/sh "./configure" '--prefix=/usr/local' '--enable-largefiles' '--cache-file=/dev/null' '--srcdir=.' $ac_configure_extra_args --no-create --no-recursion + exec /bin/sh "./configure" '--prefix=/usr/local' '--enable-ssl' '--cache-file=/dev/null' '--srcdir=.' $ac_configure_extra_args --no-create --no-recursion fi exec 5>>config.log @@ -481,11 +481,11 @@ s,@libdir@,|#_!!_#|${exec_prefix}/lib,g s,@localedir@,|#_!!_#|${datarootdir}/locale,g s,@mandir@,|#_!!_#|${datarootdir}/man,g -s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"\\" -DPACKAGE_TARNAME=\\"\\" -DPACKAGE_VERSION=\\"\\" -DPACKAGE_STRING=\\"\\" -DPACKAGE_BUGREPORT=\\"\\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1,g +s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"\\" -DPACKAGE_TARNAME=\\"\\" -DPACKAGE_VERSION=\\"\\" -DPACKAGE_STRING=\\"\\" -DPACKAGE_BUGREPORT=\\"\\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 -DHAVE_EVP_BF_CBC=1 -DHAVE_EVP_RC2_CBC=1 -DHAVE_EVP_RC4=1 -DHAVE_EVP_DES_CBC=1 -DHAVE_EVP_DESX_CBC=1 -DHAVE_EVP_CAST5_CBC=1 -DHAVE_EVP_IDEA_CBC=1 -DHAVE_EVP_AES_128_CBC=1 -DHAVE_EVP_AES_256_CBC=1 -DUSE_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_OSS=1,g s,@ECHO_C@,|#_!!_#|\\c,g s,@ECHO_N@,|#_!!_#|,g s,@ECHO_T@,|#_!!_#|,g -s,@LIBS@,|#_!!_#|-lz ,g +s,@LIBS@,|#_!!_#|-lcrypto -lssl -lz ,g s,@build_alias@,|#_!!_#|,g s,@host_alias@,|#_!!_#|,g s,@target_alias@,|#_!!_#|,g Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/crc32.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/crc32.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/expect.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/expect.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/file.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/file.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/http.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/http.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/inet.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/inet.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/libUseful-2.0.a and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/libUseful-2.0.a differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/libUseful-2.0.so and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/libUseful-2.0.so differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/libsettings.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/libsettings.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/list.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/list.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/md5c.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/md5c.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/oauth.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/oauth.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/pty.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/pty.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/sha1.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/sha1.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/sha2.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/sha2.o differ diff -Nru movgrab-1.1.14/libUseful-2.0/socket.c movgrab-1.1.15/libUseful-2.0/socket.c --- movgrab-1.1.14/libUseful-2.0/socket.c 2012-12-04 07:34:48.000000000 +0000 +++ movgrab-1.1.15/libUseful-2.0/socket.c 2012-12-30 12:27:42.000000000 +0000 @@ -606,8 +606,8 @@ // if ((StrLen(KeyFile)==0) && (StrLen(Pass) > 0)) Tempstr=CopyStr(Tempstr,"ssh -2 -e none "); // else - //Tempstr=CopyStr(Tempstr,"ssh -2 -T "); - Tempstr=CopyStr(Tempstr,"ssh -2 "); + Tempstr=CopyStr(Tempstr,"ssh -2 -T "); + //Tempstr=CopyStr(Tempstr,"ssh -2 "); if (StrLen(KeyFile)) { @@ -888,11 +888,11 @@ } -#ifdef HAVE_LIBSSL int INTERNAL_SSL_INIT() { static int InitDone=FALSE; +#ifdef HAVE_LIBSSL if (InitDone) return(TRUE); SSL_library_init(); #ifdef USE_OPENSSL_ADD_ALL_ALGORITHMS @@ -901,9 +901,16 @@ SSL_load_error_strings(); InitDone=TRUE; + return(TRUE); -} #endif + return(FALSE); +} + +int SSLAvailable() +{ +return(INTERNAL_SSL_INIT()); +} int DoSSLClientNegotiation(STREAM *S, int Flags) { diff -Nru movgrab-1.1.14/libUseful-2.0/socket.h movgrab-1.1.15/libUseful-2.0/socket.h --- movgrab-1.1.14/libUseful-2.0/socket.h 2012-12-04 07:34:48.000000000 +0000 +++ movgrab-1.1.15/libUseful-2.0/socket.h 2012-12-30 12:27:55.000000000 +0000 @@ -75,6 +75,7 @@ char *IPtoStr(unsigned long); unsigned long StrtoIP(char *); int IsIPAddress(char *); +int SSLAvailable(); int STREAMAddConnectionHop(STREAM *S, char *Value); Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/socket.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/socket.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/sound.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/sound.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/string.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/string.o differ Binary files /tmp/9To3oJ_FsK/movgrab-1.1.14/libUseful-2.0/unix_socket.o and /tmp/wA4_Z42KvE/movgrab-1.1.15/libUseful-2.0/unix_socket.o differ diff -Nru movgrab-1.1.14/main.c movgrab-1.1.15/main.c --- movgrab-1.1.14/main.c 2012-12-04 07:34:49.000000000 +0000 +++ movgrab-1.1.15/main.c 2012-12-30 12:52:03.000000000 +0000 @@ -84,8 +84,16 @@ Doc=CopyStr(Doc,ptr); if (strcasecmp(Proto,"https")==0) { -Flags |= FLAG_HTTPS; -DefaultPort=443; + if (SSLAvailable) + { + Flags |= FLAG_HTTPS; + DefaultPort=443; + } + else + { + printf("SSL NOT COMPILED IN! Switching from 'https' to 'http'\n"); + NextPath=MCopyStr(NextPath,"http://",Server,"/",ptr); + } } if (Port==0) Port=DefaultPort; @@ -221,10 +229,11 @@ } -void DisplayAvailableFormats(ListNode *Vars, char *Formats) +int DisplayAvailableFormats(ListNode *Vars, char *Formats) { char *Token=NULL, *TokenID=NULL, *Tempstr=NULL, *ptr; STREAM *S; +int result=TRUE; fprintf(stderr, "\nFormats available for this Movie:"); @@ -241,6 +250,14 @@ fprintf(stderr,"%s",Token); if (S) { + Tempstr=CopyStr(Tempstr,STREAMGetValue(S,"HTTP:ResponseCode")); + if (strcmp(Tempstr,"200") !=0) + { + printf("\nERROR: %s\n",Tempstr); + result=FALSE; + break; + } + Tempstr=CopyStr(Tempstr,STREAMGetValue(S,"HTTP:Content-length")); fprintf(stderr, " (%s)",GetHumanReadableDataQty(strtod(Tempstr,NULL),FALSE)); STREAMClose(S); @@ -256,6 +273,8 @@ DestroyString(Token); DestroyString(TokenID); DestroyString(Tempstr); + +return(result); } //this function compares the video formats found on the page to the list of diff -Nru movgrab-1.1.14/servicetypes.c movgrab-1.1.15/servicetypes.c --- movgrab-1.1.14/servicetypes.c 2012-12-04 07:34:49.000000000 +0000 +++ movgrab-1.1.15/servicetypes.c 2012-12-30 14:26:45.000000000 +0000 @@ -346,6 +346,11 @@ { Type=TYPE_ANIMEHERE; } +else if (strstr(Server,".google.")) +{ + Type=TYPE_GOOGLE_URL; +} + return(Type); } @@ -558,6 +563,16 @@ { NextPath=MCopyStr(NextPath,"http://player.vimeo.com/video/",Doc,NULL); } +else if (Type==TYPE_GOOGLE_URL) +{ + ptr=strstr(Path,"url="); + if (ptr) + { + ptr+=4; + ptr=GetToken(ptr,"&",&Token,NULL); + NextPath=HTTPUnQuote(NextPath,Token); + } +} else { NextPath=CopyStr(NextPath,Path); @@ -1220,13 +1235,13 @@ case TYPE_DAILYMOTION: #define DAILYMOTION_ITEM "oembed?url=" #define DAILYMOTION_ITEM_END "&format=xml" -#define DAILYMOTION_TITLE_START "

" +#define DAILYMOTION_TITLE_END "" if (strstr(Tempstr,DAILYMOTION_TITLE_START)) { - GenericExtractFromLine(Tempstr, "Title",DAILYMOTION_TITLE_START,DAILYMOTION_TITLE_END,Vars,EXTRACT_DEQUOTE); + GenericExtractFromLine(Tempstr, "Title",DAILYMOTION_TITLE_START,DAILYMOTION_TITLE_END,Vars, EXTRACT_DEQUOTE | EXTRACT_DEHTMLQUOTE); } @@ -2225,6 +2240,9 @@ break; +case TYPE_GOOGLE_URL: + SetVar(Vars,"item:reference",URL); +break; diff -Nru movgrab-1.1.14/servicetypes.h movgrab-1.1.15/servicetypes.h --- movgrab-1.1.14/servicetypes.h 2012-12-04 07:34:49.000000000 +0000 +++ movgrab-1.1.15/servicetypes.h 2012-12-30 12:33:38.000000000 +0000 @@ -6,7 +6,7 @@ typedef enum {TYPE_NONE, TYPE_GENERIC, TYPE_YOUTUBE, TYPE_METACAFE, TYPE_DAILYMOTION, TYPE_BREAK_COM, TYPE_EHOW, TYPE_VIMEO, TYPE_FIVE_MIN, TYPE_VBOX7,TYPE_BLIPTV,TYPE_TED, TYPE_MYVIDEO, TYPE_CLIPSHACK, TYPE_MYTOPCLIP,TYPE_REDBALCONY, TYPE_MOBANGO, TYPE_YALE, TYPE_PRINCETON, TYPE_REUTERS, TYPE_LIVELEAK, TYPE_ACADEMIC_EARTH,TYPE_PHOTOBUCKET,TYPE_VIDEOEMO,TYPE_ALJAZEERA,TYPE_MEFEEDIA,TYPE_IVIEWTUBE,TYPE_WASHINGTONPOST,TYPE_CBSNEWS,TYPE_FRANCE24,TYPE_EURONEWS,TYPE_METATUBE,TYPE_MOTIONFEEDS,TYPE_ESCAPIST,TYPE_GUARDIAN,TYPE_REDORBIT,TYPE_SCIVEE,TYPE_IZLESE, TYPE_UCTV, TYPE_ROYALSOCIETY, TYPE_BRITISHACADEMY, TYPE_KAVLIINSTITUTE,TYPE_DOTSUB,TYPE_ASTRONOMYCOM, TYPE_TEACHERTUBE, TYPE_DISCOVERY, TYPE_BLOOMBERG,TYPE_NATGEO,TYPE_VIDEOBASH,TYPE_IBTIMES,TYPE_SMH,TYPE_PRESSTV,TYPE_VIDEOJUG,TYPE_ANIMEHERE, /*Following ones are not real types, but used by internal processes */ -TYPE_METACAFE_JS_REDIR, TYPE_METACAFE_FINAL, TYPE_DAILYMOTION_STAGE2, TYPE_DAILYMOTION_STAGE3, TYPE_VIMEO_STAGE2, TYPE_VIMEO_STAGE3, TYPE_EHOW_STAGE2, TYPE_CLIPSHACK_STAGE2, TYPE_CLIPSHACK_STAGE3, TYPE_VIDEOEMO_STAGE2,TYPE_MYVIDO1_STAGE2, TYPE_REFERENCE, TYPE_WASHINGTONPOST_JSON, TYPE_WASHINGTONPOST_STAGE2, TYPE_BLIPTV_STAGE2, TYPE_BLIPTV_STAGE3, TYPE_ESCAPIST_STAGE2, TYPE_REDORBIT_STAGE2, TYPE_REDBALCONY_STAGE2,TYPE_BRITISHACADEMY_STAGE2, TYPE_KAVLIINSTITUTE_STAGE2,TYPE_ASTRONOMYCOM_STAGE2,TYPE_CONTAINERFILE,TYPE_TEACHERTUBE_STAGE2,TYPE_VIDEOJUG_STAGE2,TYPE_VIDEOJUG_STAGE3, TYPE_ANIMEHERE_STAGE2}TDT; +TYPE_METACAFE_JS_REDIR, TYPE_METACAFE_FINAL, TYPE_DAILYMOTION_STAGE2, TYPE_DAILYMOTION_STAGE3, TYPE_VIMEO_STAGE2, TYPE_VIMEO_STAGE3, TYPE_EHOW_STAGE2, TYPE_CLIPSHACK_STAGE2, TYPE_CLIPSHACK_STAGE3, TYPE_VIDEOEMO_STAGE2,TYPE_MYVIDO1_STAGE2, TYPE_REFERENCE, TYPE_WASHINGTONPOST_JSON, TYPE_WASHINGTONPOST_STAGE2, TYPE_BLIPTV_STAGE2, TYPE_BLIPTV_STAGE3, TYPE_ESCAPIST_STAGE2, TYPE_REDORBIT_STAGE2, TYPE_REDBALCONY_STAGE2,TYPE_BRITISHACADEMY_STAGE2, TYPE_KAVLIINSTITUTE_STAGE2,TYPE_ASTRONOMYCOM_STAGE2,TYPE_CONTAINERFILE,TYPE_TEACHERTUBE_STAGE2,TYPE_VIDEOJUG_STAGE2,TYPE_VIDEOJUG_STAGE3, TYPE_ANIMEHERE_STAGE2, TYPE_GOOGLE_URL} TDT; extern char *DownloadTypes[], *DownloadNames[], *TestLinks[];