22#include "containerfiles.h"
33#include "selectformat.h"
44#include "download.h"
5- #include "ign.h"
65#include "youtube.h"
76#include "settings.h"
87
@@ -18,7 +17,7 @@ Then site specific
1817
1918
2019//Site type names used at the command line etc
21- char * DownloadTypes []= {"none" ,"generic" ,"youtube" ,"youtu.be" ,"metacafe" ,"dailymotion" ,"break" ,"ehow" , " vimeo""ted" ,"reuters" ,"liveleak" ,"photobucket" ,"washingtonpost" ,"cbsnews" ,"france24" ,"euronews" ,"metatube" ,"guardian" ,"redorbit" ,"uctv.tv" ,"dotsub" ,"astronomy.com" ,"discovery" ,"bloomberg" ,"nationalgeographic" ,"videobash" , " smh""funnyordie" , "ign" , " ebaumsworld""gamestar" , " imdb""charlierose" ,"stanfordoc" ,"screencast.com" ,"royalsociety.tv" ,NULL };
20+ char * DownloadTypes []= {"none" ,"generic" ,"youtube" ,"youtu.be" ,"metacafe" ,"dailymotion" ,"break" ,"vimeo" ,"ted" ,"reuters" ,"liveleak" ,"photobucket" ,"washingtonpost" ,"cbsnews" ,"france24" ,"euronews" ,"metatube" ,"guardian" ,"redorbit" ,"uctv.tv" ,"dotsub" ,"astronomy.com" ,"discovery" ,"bloomberg" ,"nationalgeographic" ,"smh" ,"ebaumsworld" ,"imdb" ,"charlierose" ,"stanfordoc" ,"screencast.com" ,"royalsociety.tv" , "bitchute "NULL };
2221
2322//Longer names used in display
2423char * DownloadNames []= {"none" ,
@@ -28,7 +27,6 @@ char *DownloadNames[]={"none",
2827"Metacafe: http://www.metacafe.com" ,
2928"Daily Motion: http://www.dailymotion.com" ,
3029"www.break.com" ,
31- "www.ehow.com" ,
3230"www.vimeo.com" ,
3331"www.ted.com" ,
3432"Reuters: http://www.reuters.com/" ,
@@ -47,29 +45,25 @@ char *DownloadNames[]={"none",
4745"dsc.discovery.com" ,
4846"www.bloomberg.com (not bloomberg.tv)" ,
4947"National Geographic (http://video.nationalgeographic.com)" ,
50- "videobash" ,
5148"Sidney Morning Herald" ,
52- "Funny or Die (http://www.funnyordie.com)" ,
53- "IGN" ,
5449"Ebaums World" ,
55- "www.gamestar.de" ,
5650"www.imdb.com" ,
5751"Charlie Rose" ,
5852"Stanford Open Classroom" ,
5953"UDemy" ,
6054"http://royalsociety.org/" ,
55+ "BitChute" ,
6156NULL };
6257
6358//"http://vimeo.com/33204284",
6459//links used by the -test-sites feature to test if a download site still
6560//works with movgrab
6661char * TestLinks []= {"" , "" ,
67- "http ://www.youtube.com/watch?v=Vxp3seoRNgY " ,
68- "http://youtu.be/OdrEId7YI1k " ,
62+ "https ://www.youtube.com/watch?v=GrK9EaQRp2I " ,
63+ "http://youtu.be/mvEPnhmtXY0 " ,
6964"http://metacafe.com/watch/11419763/super-blood-moon-eclipse-2015/" ,
7065"http://www.dailymotion.com/video/x5790e_hubblecast-16-galaxies-gone-wild_tech" ,
7166"http://www.break.com/video/break-compilations-2591623/cats-vs-the-world-iii-breaking-videos-3075295" ,
72- "http://www.ehow.com/video_6819748_creamy-thyme-scrambled-eggs-recipe.html" ,
7367"broken" ,
7468"http://www.ted.com/talks/janine_benyus_shares_nature_s_designs.html" ,
7569"http://www.reuters.com/video/2016/05/02/foam-swords-drawn-in-mass-play-fight-in?videoId=368328211" ,
@@ -78,8 +72,8 @@ char *TestLinks[]={"", "",
7872"http://www.washingtonpost.com/video/politics/tom-prices-tense-senate-finance-hearing/2017/01/24/f0c35346-e282-11e6-a419-eefe8eff0835_video.html" ,
7973"http://www.cbsnews.com/video/watch/?id=7357739n" ,
8074"http://www.france24.com/en/20160430-down-earth-fast-fashion-pollution-environment-ethical-consumption" ,
81- "http ://www.euronews.com/news/bulletin/ " ,
82- "http ://www.metatube.com/en/videos/cid2/Funny-Videos/53210/Rail-Jump-Fail /" ,
75+ "https ://www.euronews.com/2019/06/27/astronaut-luca-parmitano-chronicles-his-mission-for-euronews " ,
76+ "https ://www.metatube.com/en/videos/266906/Ex-Machina-Movie-TRAILER-2-2015 /" ,
8377"http://www.guardian.co.uk/world/video/2011/may/13/fukushima-radiation-dairy-farmers-video" ,
8478"http://www.redorbit.com/video/using-f1-technology-to-transform-healthcare-012016/" ,
8579"http://www.uctv.tv/search-details.aspx?showID=20888" ,
@@ -88,18 +82,15 @@ char *TestLinks[]={"", "",
8882"http://dsc.discovery.com/videos/how-the-universe-works-birth-of-a-black-hole.html" ,
8983"http://www.bloomberg.com/video/72477250/" ,
9084"http://video.nationalgeographic.com/video/environment/environment-natural-disasters/earthquakes/earthquake-101/" ,
91- "http://www.videobash.com/video_show/wing-suit-amazing-footage-6086" ,
9285"http://www.smh.com.au/technology/sci-tech/newly-discovered-planets-include-superearth-20110913-1k7tl.html" ,
93- "http://www.funnyordie.com/videos/032785be3a/genie-on-hard-times-with-parker-posey?playlist=featured_videos" ,
94- "http://www.ign.com/videos/2013/06/05/the-last-of-us-review" ,
95- "http://www.ebaumsworld.com/videos/a-giant-python-opens-the-door/83367677/" ,
96- "http://www.gamestar.de/videos/trailer,3/hobbit-3-die-schlacht-der-fuenf-heere,76110.html" ,
86+ "https://www.ebaumsworld.com/videos/spacex-released-a-blooper-reel-of-all-their-failed-flights-and-landings/85465411/" ,
9787"http://www.imdb.com/video/imdb/vi3832131865" ,
9888"https://charlierose.com/videos/27996" ,
9989"http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=wget&speed=100" ,
10090"http://www.brainstuffshow.com/videos/how-gps-coordinates-work-video.htm" ,
10191//"http://royalsociety.tv/rsPlayer.aspx?presentationid=474",
10292"broken" ,
93+ "https://www.bitchute.com/video/v_UdkNgeuRY/" ,
10394NULL };
10495
10596
@@ -138,10 +129,6 @@ else if (strcmp(Server,"www.break.com")==0)
138129{
139130 Type = TYPE_BREAK_COM ;
140131}
141- else if (strstr (Server ,".ehow." ))
142- {
143- Type = TYPE_EHOW ;
144- }
145132else if (strcmp (Server ,"www.dailymotion.com" )== 0 )
146133{
147134 Type = TYPE_DAILYMOTION ;
@@ -234,18 +221,6 @@ else if (strstr(Server,"bloomberg.com"))
234221{
235222 Type = TYPE_BLOOMBERG ;
236223}
237- else if (strstr (Server ,"www.videobash.com" ))
238- {
239- Type = TYPE_VIDEOBASH ;
240- }
241- else if (strstr (Server ,"funnyordie.com" ))
242- {
243- Type = TYPE_FUNNYORDIE ;
244- }
245- else if (strstr (Server ,".ign." ))
246- {
247- Type = TYPE_IGN ;
248- }
249224else if (strstr (Server ,".imdb.com" ))
250225{
251226 Type = TYPE_IMDB ;
@@ -254,10 +229,6 @@ else if (strstr(Server,".ebaumsworld.com"))
254229{
255230 Type = TYPE_EBAUMSWORLD ;
256231}
257- else if (strstr (Server ,".gamestar.de" ))
258- {
259- Type = TYPE_GAMESTAR ;
260- }
261232else if (strstr (Server ,"charlierose.com" ))
262233{
263234 Type = TYPE_CHARLIEROSE ;
@@ -274,6 +245,10 @@ else if (strstr(Server,"screencast.com"))
274245{
275246 Type = TYPE_SCREENCAST_COM ;
276247}
248+ else if (strstr (Server ,"bitchute.com" ))
249+ {
250+ Type = TYPE_BITCHUTE ;
251+ }
277252
278253
279254
@@ -548,6 +523,7 @@ case TYPE_BREAK_COM:
548523 RetVal = DownloadPage (Tempstr ,TYPE_BREAK_STAGE2 ,Title ,Flags );
549524break ;
550525
526+
551527case TYPE_VIMEO :
552528 RetVal = DownloadPage (GetVar (Vars ,"ID" ),TYPE_VIMEO_STAGE2 ,Title ,Flags );
553529break ;
@@ -584,11 +560,6 @@ case TYPE_BLOOMBERG:
584560 RetVal = DownloadItem (Tempstr , Title , Fmt , Flags );
585561break ;
586562
587- case TYPE_IGN :
588- Tempstr = SubstituteVarsInString (Tempstr ,"http://apis.ign.com/video/v3/videos/$(ID)" ,Vars ,0 );
589- RetVal = DownloadPage (Tempstr ,TYPE_IGN_STAGE2 , Title ,Flags );
590- break ;
591-
592563case TYPE_IMDB :
593564 Tempstr = SubstituteVarsInString (Tempstr ,"http://www.imdb.com/video/imdb/vi$(ID)/imdb/single" ,Vars ,0 );
594565 RetVal = DownloadPage (Tempstr ,TYPE_IMDB_STAGE2 , Title ,Flags );
@@ -601,20 +572,14 @@ case TYPE_REUTERS:
601572break ;
602573
603574
604- case TYPE_GAMESTAR :
605- Tempstr = SubstituteVarsInString (Tempstr ,"http://gamestar.de/_misc/videos/portal/getVideoUrl.cfm?premium=0&videoId=$(ID)" ,Vars ,0 );
606- RetVal = DownloadItem (Tempstr , Title , Fmt , Flags );
607- break ;
608-
609-
610575case TYPE_STANFORD_OPENCLASS :
611576 Tempstr = SubstituteVarsInString (Tempstr ,"http://openclassroom.stanford.edu/MainFolder/courses/$(course)/videos/$(ID).xml" ,Vars ,0 );
612577 Title = SubstituteVarsInString (Title ,"$(course)-$(ID)" ,Vars ,0 );
613578
614579 RetVal = DownloadPage (Tempstr ,TYPE_STANFORD_STAGE2 , Title ,Flags );
615580break ;
616581
617-
582+ case TYPE_BITCHUTE :
618583case TYPE_DOTSUB :
619584case TYPE_GENERIC :
620585case TYPE_TED :
@@ -634,23 +599,23 @@ case TYPE_DISCOVERY:
634599case TYPE_REDORBIT_STAGE2 :
635600case TYPE_ASTRONOMYCOM_STAGE2 :
636601case TYPE_BREAK_STAGE2 :
637- case TYPE_IGN_STAGE2 :
638602case TYPE_IMDB_STAGE2 :
639603case TYPE_STANFORD_STAGE2 :
640604case TYPE_REUTERS_STAGE2 :
641- case TYPE_FUNNYORDIE :
642605case TYPE_EBAUMSWORLD :
643606case TYPE_DAILYMOTION :
644- case TYPE_VIDEOBASH :
645607case TYPE_SCREENCAST_COM :
646- case TYPE_EHOW :
647608case TYPE_CHARLIEROSE :
648609case TYPE_CONTAINERFILE_PLS :
649610case TYPE_CONTAINERFILE_ASX :
650611case TYPE_CONTAINERFILE_M3U8 :
651612 Tempstr = CopyStr (Tempstr , GetVar (Vars ,"ID" ));
613+ if (strncmp (Tempstr , "https://www.youtube.com/" ,24 )== 0 ) RetVal = GrabMovie (Tempstr , TYPE_YOUTUBE );
614+ else
615+ {
652616 if ((strncmp (Tempstr ,"icy:" ,4 )!= 0 ) && (strncmp (Tempstr ,"http:" ,5 )!= 0 ) && (strncmp (Tempstr ,"https:" ,6 )!= 0 )) Tempstr = MCopyStr (Tempstr ,"http:" ,GetVar (Vars ,"ID" ),NULL );
653617 RetVal = DownloadItem (Tempstr , Title , Fmt , Flags );
618+ }
654619break ;
655620}
656621
@@ -891,25 +856,6 @@ case TYPE_BREAK_STAGE2:
891856 }
892857break ;
893858
894- case TYPE_EHOW :
895- #define EHOW_LINE "property=\"og:video\""
896- #define EHOW_ITEM "source="
897- #define EHOW_ITEM_END "&"
898- #define EHOW_TITLE "<h1 class=\"Heading1a\">"
899- #define EHOW_TITLE_END "</h1>"
900-
901- if (strstr (Tempstr ,EHOW_LINE ))
902- {
903- GenericExtractFromLine (Tempstr , "item:flv" ,EHOW_ITEM ,EHOW_ITEM_END ,Vars ,EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
904- }
905-
906- ptr = strstr (Tempstr ,EHOW_TITLE );
907- if (ptr )
908- {
909- GenericExtractFromLine (Tempstr , "Title" ,EHOW_TITLE ,EHOW_TITLE_END ,Vars ,EXTRACT_DEQUOTE );
910- }
911- break ;
912-
913859
914860
915861case TYPE_VIMEO :
@@ -1235,6 +1181,20 @@ case TYPE_BLOOMBERG:
12351181 }
12361182break ;
12371183
1184+ case TYPE_BITCHUTE :
1185+ #define BITCHUTE_ITEMSTART "<source src=\""
1186+ #define BITCHUTE_ITEMEND "\""
1187+ #define BITCHUTE_TITLE_START "<h1 id=\"video-title\" class=\"page-title\">"
1188+ #define BITCHUTE_TITLE_END "</h1"
1189+
1190+ if (strstr (Tempstr , BITCHUTE_TITLE_START )) GenericExtractFromLine (Tempstr , "Title:html" , BITCHUTE_TITLE_START , BITCHUTE_TITLE_END ,Vars ,EXTRACT_DESLASHQUOTE | EXTRACT_NOSPACES );
1191+ if (strstr (Tempstr ,BITCHUTE_ITEMSTART ))
1192+ {
1193+ GenericExtractFromLine (Tempstr , "item:mp4" ,BITCHUTE_ITEMSTART ,BITCHUTE_ITEMEND ,Vars ,EXTRACT_DESLASHQUOTE | EXTRACT_NOSPACES );
1194+ }
1195+ break ;
1196+
1197+
12381198case TYPE_NATGEO :
12391199#define NATGEO_ITEM_START "HTML5src:'"
12401200#define NATGEO_ITEM_END "\'"
@@ -1256,32 +1216,6 @@ case TYPE_NATGEO:
12561216 }
12571217break ;
12581218
1259- case TYPE_VIDEOBASH :
1260- #define VIDEOBASH_ITEMSTART "&file=\" + 'http://' + '"
1261- #define VIDEOBASH_ITEMEND "\'"
1262-
1263- GenericTitleExtract (Tempstr , Vars );
1264- if (strstr (Tempstr ,VIDEOBASH_ITEMSTART ))
1265- {
1266- GenericExtractFromLine (Tempstr , "item:mp4" ,VIDEOBASH_ITEMSTART ,VIDEOBASH_ITEMEND ,Vars ,EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
1267- }
1268- break ;
1269-
1270-
1271- case TYPE_IGN :
1272- #define IGN_ITEMSTART "video_id\":\""
1273- #define IGN_ITEMEND "\""
1274-
1275- GenericTitleExtract (Tempstr , Vars );
1276- if (strstr (Tempstr ,IGN_ITEMSTART ))
1277- {
1278- GenericExtractFromLine (Tempstr , "ID" ,IGN_ITEMSTART ,IGN_ITEMEND ,Vars ,EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
1279- }
1280- break ;
1281-
1282- case TYPE_IGN_STAGE2 :
1283- IGN_DecodeFormats (Tempstr , Vars );
1284- break ;
12851219
12861220case TYPE_IMDB :
12871221#define IMDB_ITEMSTART "://www.imdb.com/video/imdb/vi"
@@ -1316,31 +1250,21 @@ break;
13161250
13171251
13181252case TYPE_EBAUMSWORLD :
1319- #define EBAUMSWORLD_ITEMSTART "params.file = '"
1253+ #define EBAUMSWORLD_ITEMSTART "'file': '"
1254+ #define EBAUMSWORLD_ITEMSTART2 "params.file = '"
13201255#define EBAUMSWORLD_ITEMEND "'"
13211256
13221257 GenericTitleExtract (Tempstr , Vars );
13231258 if (strstr (Tempstr ,EBAUMSWORLD_ITEMSTART ))
13241259 {
1325- GenericExtractFromLine (Tempstr , "ID" ,EBAUMSWORLD_ITEMSTART ,EBAUMSWORLD_ITEMEND ,Vars ,EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
1260+ GenericExtractFromLine (Tempstr , "ID" , EBAUMSWORLD_ITEMSTART , EBAUMSWORLD_ITEMEND , Vars , EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
13261261 }
1327- break ;
13281262
1329- case TYPE_GAMESTAR :
1330- #define GAMESTAR_ITEMSTART "var iVideoId ="
1331- #define GAMESTAR_ITEMEND ";"
1332- #define GAMESTAR2_ITEMSTART "ga('set', 'dimension4', '"
1333- #define GAMESTAR2_ITEMEND "'"
1334-
1335- GenericTitleExtract (Tempstr , Vars );
1336- if (strstr (Tempstr ,GAMESTAR_ITEMSTART ))
1263+ if (strstr (Tempstr ,EBAUMSWORLD_ITEMSTART2 ))
13371264 {
1338- GenericExtractFromLine (Tempstr , "ID" ,GAMESTAR_ITEMSTART ,GAMESTAR_ITEMEND ,Vars ,EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
1339- }
1340- if (strstr (Tempstr ,GAMESTAR2_ITEMSTART ))
1341- {
1342- GenericExtractFromLine (Tempstr , "ID" ,GAMESTAR2_ITEMSTART ,GAMESTAR2_ITEMEND ,Vars ,EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
1265+ GenericExtractFromLine (Tempstr , "ID" , EBAUMSWORLD_ITEMSTART2 , EBAUMSWORLD_ITEMEND , Vars , EXTRACT_DEQUOTE | EXTRACT_NOSPACES );
13431266 }
1267+
13441268break ;
13451269
13461270case TYPE_SCREENCAST_COM :
@@ -1476,7 +1400,6 @@ case TYPE_REDORBIT:
14761400case TYPE_GUARDIAN :
14771401case TYPE_LIVELEAK :
14781402case TYPE_DOTSUB :
1479- case TYPE_FUNNYORDIE :
14801403case TYPE_CHARLIEROSE :
14811404GenericTitleExtract (Tempstr , Vars );
14821405ptr = strstr (Tempstr ,HTML5_ITEM_START );
@@ -1516,15 +1439,16 @@ break;
15161439
15171440case TYPE_EURONEWS :
15181441case TYPE_DISCOVERY :
1442+
15191443#define OG_URL "<meta property=\"og:video:url\" content=\""
15201444#define OG2_URL "<meta property=\"og:video\" content=\""
15211445#define TWITTER_URL "<meta name=\"twitter:player:stream\" content=\""
15221446#define OG_END "\""
15231447
15241448 GenericTitleExtract (Tempstr , Vars );
1525- if (strstr (Tempstr , OG_URL )) GenericExtractFromLine (Tempstr , "ID" ,OG_URL ,OG_END ,Vars ,EXTRACT_GUESSTYPE );
1526- if (strstr (Tempstr , OG2_URL )) GenericExtractFromLine (Tempstr , "ID" ,OG2_URL ,OG_END ,Vars ,EXTRACT_GUESSTYPE );
1527- if (strstr (Tempstr , TWITTER_URL )) GenericExtractFromLine (Tempstr , "ID" ,TWITTER_URL ,OG_END ,Vars ,EXTRACT_GUESSTYPE );
1449+ if (strstr (Tempstr , OG_URL )) GenericExtractFromLine (Tempstr , "ID" , OG_URL ,OG_END ,Vars ,EXTRACT_GUESSTYPE );
1450+ if (strstr (Tempstr , OG2_URL )) GenericExtractFromLine (Tempstr , "ID" , OG2_URL ,OG_END ,Vars ,EXTRACT_GUESSTYPE );
1451+ if (strstr (Tempstr , TWITTER_URL )) GenericExtractFromLine (Tempstr , "ID" , TWITTER_URL ,OG_END ,Vars ,EXTRACT_GUESSTYPE );
15281452break ;
15291453}
15301454
@@ -1550,7 +1474,7 @@ else
15501474{
15511475 if (! StrValid (GetVar (Vars ,"ID" )))
15521476 {
1553- Type = SelectDownloadFormat (Vars ,Type ,TRUE );
1477+ Type = SelectDownloadFormat (Vars ,Type );
15541478 }
15551479
15561480 ptr = GetVar (Vars ,"ID" );
0 commit comments