Version 2.5.2

4 files changed, 7 insertions, 247 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f0900dff517..3ee6baa3293a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xvst
 	pkgdesc = GUI tool for downloading videos from sites like YouTube, GoogleVideo etc.
-	pkgver = 2.5.1
-	pkgrel = 3
+	pkgver = 2.5.2
+	pkgrel = 1
 	url = http://xviservicethief.sourceforge.net
 	arch = i686
 	arch = x86_64
@@ -12,21 +12,15 @@ pkgbase = xvst
 	depends = qt5-webkit
 	depends = qt5-script
 	optdepends = flvstreamer: for downloading flv files.
-	source = xvst-2.5.1.tar.gz::https://github.com/xVST/xVideoServiceThief/archive/2.5.1.tar.gz
-	source = qdatastream.patch::https://github.com/xVST/xVideoServiceThief/commit/86abff9767e7fed9b8a78681a40ad688fea393d6.patch
+	source = xvst-2.5.2.tar.gz::https://github.com/xVST/xVideoServiceThief/archive/2.5.2.tar.gz
 	source = xvst.desktop
-	source = beeg.patch
-	source = chilloutzone.patch
 	source = disable_update.patch
 	source = keezmovies.patch
 	source = myvideo.patch
 	source = sunporno.patch
 	source = wat.tv.patch
-	sha256sums = 412d0489a56837cfa74e6c71ddb5972fc782d91e0d50095f61980a9edc0bab69
-	sha256sums = ba5e2646c9cd8b0c23c243175de11bc2fe72635affc4318e623799bf7cf5316c
+	sha256sums = f54e5492bc1bfc7c2b1b24242de77e0821d85a1bb263d77c4b646789ab570b6e
 	sha256sums = 0a1344c9bd969c2fd608e071426c562386691e8815a13097c0f71c3b82876b18
-	sha256sums = 9a6e19b8b68721eaed36e3721be859b148f2bca9c1dfc17d7beabc01aeb203ac
-	sha256sums = fbf3e0b4a0f827685a0f23c2b6d64e18f8ce0b4bb4a639ca4b57b2f05dc08461
 	sha256sums = cea0379535ae99f19a1d8b3f1abfdd8a6f9ff4ee9dd2853061c6f42ba0fcde1c
 	sha256sums = ae4af13b96095f8a0d491bab6865c2f75175b9f71762cba868b70aedc6890c73
 	sha256sums = f5d395343cce45597c879e6836761aa481a51e07e7bc26c885ec9e0ac16f5272
diff --git a/PKGBUILD b/PKGBUILD
index 43362b43a0fc..b1ce4fe7a8a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=xvst
 _pkgname=xVideoServiceThief
-pkgver=2.5.1
-pkgrel=3
+pkgver=2.5.2
+pkgrel=1
 pkgdesc='GUI tool for downloading videos from sites like YouTube, GoogleVideo etc.'
 url='http://xviservicethief.sourceforge.net'
 license=('GPL3')
@@ -16,20 +16,14 @@ depends=('ffmpeg' 'qt5-webkit' 'qt5-script')
 makedepends=('sed' 'qt5-tools')
 optdepends=('flvstreamer: for downloading flv files.')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/xVST/xVideoServiceThief/archive/${pkgver}.tar.gz"
-        'qdatastream.patch::https://github.com/xVST/xVideoServiceThief/commit/86abff9767e7fed9b8a78681a40ad688fea393d6.patch'
         'xvst.desktop'
-        'beeg.patch'
-        'chilloutzone.patch'
         'disable_update.patch'
         'keezmovies.patch'
         'myvideo.patch'
         'sunporno.patch'
         'wat.tv.patch')
-sha256sums=('412d0489a56837cfa74e6c71ddb5972fc782d91e0d50095f61980a9edc0bab69'
-            'ba5e2646c9cd8b0c23c243175de11bc2fe72635affc4318e623799bf7cf5316c'
+sha256sums=('f54e5492bc1bfc7c2b1b24242de77e0821d85a1bb263d77c4b646789ab570b6e'
             '0a1344c9bd969c2fd608e071426c562386691e8815a13097c0f71c3b82876b18'
-            '9a6e19b8b68721eaed36e3721be859b148f2bca9c1dfc17d7beabc01aeb203ac'
-            'fbf3e0b4a0f827685a0f23c2b6d64e18f8ce0b4bb4a639ca4b57b2f05dc08461'
             'cea0379535ae99f19a1d8b3f1abfdd8a6f9ff4ee9dd2853061c6f42ba0fcde1c'
             'ae4af13b96095f8a0d491bab6865c2f75175b9f71762cba868b70aedc6890c73'
             'f5d395343cce45597c879e6836761aa481a51e07e7bc26c885ec9e0ac16f5272'
diff --git a/beeg.patch b/beeg.patch
deleted file mode 100644
index 4acd16f723c9..000000000000
--- a/beeg.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-New plugin.
-Index: xvst-2.5/resources/services/beeg/beeg.js
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xvst-2.5/resources/services/beeg/beeg.js	2013-03-29 17:01:19.486267000 +0100
-@@ -0,0 +1,122 @@
-+/*
-+*
-+* This file is part of xVideoServiceThief,
-+* an open-source cross-platform Video service download
-+*
-+* Copyright (C) 2007 - 2009 Xesc & Technology
-+*
-+* This program is free software: you can redistribute it and/or modify
-+* it under the terms of the GNU General Public License as published by
-+* the Free Software Foundation, either version 3 of the License, or
-+* (at your option) any later version.
-+*
-+* This program is distributed in the hope that it will be useful,
-+* but WITHOUT ANY WARRANTY; without even the implied warranty of
-+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+* GNU General Public License for more details.
-+*
-+* You should have received a copy of the GNU General Public License
-+* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.
-+*
-+* Contact e-mail: Xesc <xeskuu.xvst@gmail.com>
-+* Program URL   : http://xviservicethief.sourceforge.net/
-+*
-+*/
-+
-+function RegistVideoService()
-+{
-+	this.version = "3.1.0";
-+	this.minVersion = "2.0.0a";
-+	this.author = "Xesc & Technology 2009";
-+	this.website = "http://www.beeg.com/";
-+	this.ID = "beeg.com";
-+	this.caption = "beeg.";
-+	this.adultContent = true;
-+	this.musicSite = false;
-+}
-+
-+function getVideoInformation(url)
-+{
-+	// video information
-+	var result = new VideoDefinition();
-+	// download webpage
-+	var http = new Http();
-+	var html = http.downloadWebpage(url);
-+	// get video title
-+	result.title = copyBetween(html, "<title>", "</title>");
-+	// get the flv url
-+	result.URL = copyBetween(html, "so.addVariable('file','", "');");
-+	if(result.URL == "") {
-+		result.URL = copyBetween(html, "'file': '", "',");
-+	}
-+	// return the video information
-+	return result;
-+}
-+
-+function searchVideos(keyWord, pageIndex)
-+{
-+	const URL_SEARCH = "http://beeg.com/section/home/%1/";
-+	const HTML_SEARCH_ID = 'var tumbid  =[';
-+	const HTML_SEARCH_ALT = 'var tumbalt =[';
-+	const HTML_SEARCH_END = '];';
-+	const RESULTS_PER_PAGE = 5;
-+	var nCurrentPageIndex = 1;
-+	var nResultsToSkip = (pageIndex - 1) * RESULTS_PER_PAGE ;
-+	var nCurrentResults = 0;
-+	// remember the first ID so if we find again we know we searched past the last site
-+	var nFirstId = -1;
-+	// init search results object
-+	var searchResults = new SearchResults();
-+	while(nCurrentResults < RESULTS_PER_PAGE) {
-+		// init http object
-+		var http = new Http();
-+		var html = http.downloadWebpage(strFormat(URL_SEARCH, nCurrentPageIndex));
-+		// did we reach the end?
-+		if(strIndexOf(html, HTML_SEARCH_ID, 0, false) == -1) {			
-+			break;
-+		}
-+		var IDs = copyBetween(html, HTML_SEARCH_ID, HTML_SEARCH_END);
-+		var Alts = copyBetween(html, HTML_SEARCH_ALT, HTML_SEARCH_END);
-+		// if we found some results then...
-+		if (IDs != "")
-+		{
-+			// the IDs and alt-texts are JavaScript arrays already
-+			var IDblocks = eval('[' + IDs + ']');
-+			var Altblocks = eval('[' + Alts + ']');
-+			for (n = 0; n < IDblocks.length; n++) {
-+				var title = Altblocks[n];
-+				var videoURL = "http://beeg.com/" + IDblocks[n];
-+				var imageURL = "http://cdn.anythumb.com/120x90/" + IDblocks[n] + ".jpg";
-+				var imageId = IDblocks[n]
-+				if(nFirstId == -1) {
-+					nFirstId = imageId;
-+				} else if(nFirstId == imageId) {
-+					// we found the same imageId again. Stop the search.
-+					return searchResults;
-+				}
-+				if(strIndexOf(title, keyWord, 0, false) != -1) {
-+					//print('[' + nResultsToSkip + '][' + nCurrentResults + '] ' + title);
-+					if(nResultsToSkip > 0) {
-+						nResultsToSkip--;
-+					} else {
-+						if( nCurrentResults < RESULTS_PER_PAGE ) {
-+							searchResults.addSearchResult(videoURL, imageURL, title, title, 0, 0);
-+							nCurrentResults++;
-+						}
-+						if( nCurrentResults >= RESULTS_PER_PAGE ) {
-+							break;
-+						}
-+					}
-+				}
-+			}
-+		}
-+		nCurrentPageIndex++;
-+	}
-+	// return search results
-+	return searchResults;
-+}
-+
-+function getVideoServiceIcon()
-+{
-+	return "http://beeg.com/favicon.ico";
-+}
diff --git a/chilloutzone.patch b/chilloutzone.patch
deleted file mode 100644
index 142df550f578..000000000000
--- a/chilloutzone.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-New plugin.
-Index: xvst-2.4.1/resources/services/chilloutzone/chilloutzone.js
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xvst-2.4.1/resources/services/chilloutzone/chilloutzone.js	2011-10-15 22:40:55.982365314 +0200
-@@ -0,0 +1,93 @@
-+/*

-+*

-+* This file is part of xVideoServiceThief,

-+* an open-source cross-platform Video service download

-+*

-+* Copyright (C) 2007 - 2009 Xesc & Technology

-+*

-+* This program is free software: you can redistribute it and/or modify

-+* it under the terms of the GNU General Public License as published by

-+* the Free Software Foundation, either version 3 of the License, or

-+* (at your option) any later version.

-+*

-+* This program is distributed in the hope that it will be useful,

-+* but WITHOUT ANY WARRANTY; without even the implied warranty of

-+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-+* GNU General Public License for more details.

-+*

-+* You should have received a copy of the GNU General Public License

-+* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.

-+*

-+* Contact e-mail: Xesc <xeskuu.xvst@gmail.com>

-+* Program URL   : http://xviservicethief.sourceforge.net/

-+*

-+*/

-+

-+function RegistVideoService()

-+{

-+	this.version = "1.0.0";

-+	this.minVersion = "2.0.0a";

-+	this.author = "crapmaster & Xesc & Technology 2009";

-+	this.website = "http://www.chilloutzone.net";

-+	this.ID = "chilloutzone.net";

-+	this.caption = "chilloutzone";

-+	this.adultContent = false;

-+	this.musicSite = false;

-+}

-+

-+function getVideoInformation(url)

-+{

-+	// video information

-+	var result = new VideoDefinition();

-+	// download webpage

-+	var http = new Http();

-+	var html = http.downloadWebpage(url);

-+	// get video title

-+	result.title = copyBetween(html, '<h3 id="content-player-head">', '</h3>');

-+	// get the xml url

-+	var xmlUrl = copyBetween(html, 'var MOVIE_LOC_PLAIN = "', '";');

-+	// get url

-+	result.URL=cleanUrl(xmlUrl);

-+	// return the video information

-+	return result;

-+}

-+

-+function getVideoServiceIcon()

-+{

-+	return new Array(

-+		0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,

-+		0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x08,0x06,0x00,0x00,0x00,0x1f,0xf3,0xff,

-+		0x61,0x00,0x00,0x00,0x01,0x73,0x52,0x47,0x42,0x00,0xae,0xce,0x1c,0xe9,0x00,0x00,

-+		0x00,0x06,0x62,0x4b,0x47,0x44,0x00,0xff,0x00,0xff,0x00,0xff,0xa0,0xbd,0xa7,0x93,

-+		0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,

-+		0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xdb,0x0a,

-+		0x08,0x15,0x29,0x04,0x62,0xef,0x4c,0x6b,0x00,0x00,0x01,0xa6,0x49,0x44,0x41,0x54,

-+		0x38,0xcb,0xa5,0x93,0xbf,0x8a,0x14,0x41,0x10,0xc6,0x7f,0x5d,0xbd,0x3b,0x7f,0xd6,

-+		0xd3,0xf8,0xde,0x40,0x0d,0x14,0x0d,0x2e,0x31,0xd0,0xc8,0xc4,0xc0,0xc4,0x40,0x0f,

-+		0x8c,0x7d,0x81,0x0b,0x04,0xdf,0x41,0xd4,0xa7,0x38,0xd0,0xc8,0xc0,0x03,0x23,0x65,

-+		0x40,0xbd,0xbd,0x45,0x91,0x3d,0xc4,0x54,0x10,0xc5,0xc4,0x3d,0x0e,0x95,0xfd,0x33,

-+		0xdd,0x53,0x06,0xd5,0xbb,0x3b,0x2b,0x87,0x9c,0x58,0xd0,0x74,0x4d,0x57,0xd7,0x57,

-+		0x5f,0x7d,0x3d,0x05,0xff,0x69,0x0e,0x40,0x0f,0x6f,0x29,0x1a,0x20,0x44,0x08,0x0d,

-+		0xc4,0xe4,0xd7,0x11,0xea,0x90,0xd6,0x1f,0xfe,0xd7,0x12,0x77,0x7b,0xd7,0x75,0x00,

-+		0x88,0x23,0xb8,0xf3,0x02,0xbc,0x40,0x57,0x20,0x13,0xe8,0x38,0xc8,0x05,0xba,0x1e,

-+		0x72,0x67,0x67,0x65,0xfa,0x2e,0x84,0x77,0xcf,0xc7,0x54,0x55,0xa5,0x06,0x50,0x87,

-+		0x94,0xec,0xe0,0xdc,0x15,0xf0,0x0e,0x3e,0xbd,0xb2,0xa4,0xdc,0x41,0xee,0x0d,0x2c,

-+		0xb7,0x64,0x0a,0x4f,0x18,0x47,0x00,0xc4,0x00,0x62,0xba,0xec,0x6d,0xdf,0xda,0x81,

-+		0xeb,0xf7,0xe0,0xec,0x65,0x28,0x3b,0x50,0x7a,0x28,0x3c,0xf4,0x24,0xf9,0x42,0xfd,

-+		0xab,0x01,0x20,0x31,0x68,0xac,0x42,0x96,0x58,0x00,0x5c,0xbd,0x6b,0xfb,0xeb,0xfb,

-+		0xf0,0x6d,0x17,0x46,0x7d,0xbb,0x53,0x18,0x9b,0x30,0x6d,0x90,0x25,0x40,0x58,0xd2,

-+		0xec,0xca,0xaa,0xcc,0x97,0xb6,0x6c,0xdf,0x7f,0x04,0x07,0x7b,0xf0,0x63,0x60,0x00,

-+		0x13,0x25,0x5b,0x00,0xcc,0xa2,0xf5,0x36,0xaf,0xd0,0xb6,0xf7,0x0f,0xe1,0x7b,0x1f,

-+		0x0e,0x07,0x8b,0xfe,0xc9,0x85,0x38,0x6d,0xb7,0x30,0x0b,0x16,0x28,0x92,0x06,0x00,

-+		0x6f,0x1f,0x58,0xe2,0x68,0xcf,0xce,0xe7,0x3a,0x24,0x51,0xeb,0x89,0x52,0xae,0x30,

-+		0xe8,0x79,0xc8,0x12,0xc0,0xb3,0x9b,0x70,0xd0,0xb7,0xb6,0x7a,0x7e,0xa9,0xfe,0xfc,

-+		0x25,0x72,0x21,0xcc,0x56,0x18,0xd4,0x89,0x81,0x58,0x9f,0x99,0x98,0xfa,0x99,0x4b,

-+		0x6f,0x3f,0x4f,0x4e,0x2b,0x83,0x66,0xa6,0x2d,0x80,0x2f,0x27,0x18,0xbe,0xf9,0x4c,

-+		0x3d,0x6e,0x88,0x13,0x08,0x53,0x65,0x6d,0xdd,0x73,0xfe,0xc6,0x19,0x38,0xf5,0x73,

-+		0x51,0xfd,0xe9,0xb5,0x8f,0xc4,0x5a,0x69,0x6a,0x45,0x9b,0xd6,0xaf,0xfc,0x37,0xd3,

-+		0xed,0x0d,0xe5,0xf4,0x14,0x4e,0x0a,0x4f,0x2e,0x0e,0x59,0xdf,0x79,0xf9,0xef,0x03,

-+		0xa3,0xdb,0x1b,0xaa,0x1f,0x2e,0xe8,0xe3,0x35,0xd1,0xaa,0xaa,0xb4,0x1d,0x93,0x63,

-+		0x4d,0xdc,0xe6,0xc0,0x31,0xec,0x1e,0x19,0x93,0x63,0x8f,0xed,0xe6,0xc0,0x1d,0x45,

-+		0xff,0x37,0x2f,0x00,0x9b,0x4b,0xdd,0xfa,0x20,0xe7,0x00,0x00,0x00,0x00,0x49,0x45,

-+		0x4e,0x44,0xae,0x42,0x60,0x82);

-+}
-\ No newline at end of file