This commit is contained in:
DiMartinoXBMC committed 2015-01-28 22:53:45 +03:00
1 parent a0dc695015
commit 720d945133
13 files changed
+590 -369

No files matched your search

+4 -4
View File
@@ -26,12 +26,12 @@ from BeautifulSoup import BeautifulSoup
def make_category_dict():
category_dict = {
'movies': ('Forieng Movies', '/films/fl_foreign_hight/?'),
'movies': ('Movies', '/films/fl_foreign_hight/?'),
'rus_movies': ('Russian Movies', '/films/fl_our_hight/?'),
'tvshows': ('TV Shows', '/serials/fl_hight/?'),
'cartoons': ('Cartoons', '/cartoons/fl_hight/?'),
'anime': ('Anime', '/cartoons/cartoon_genre/anime/?'),
'hot': ('Hot & New', '/films/fl_hight/?'),
'hot': ('Most Recent', '/films/fl_hight/?'),
'top': ('Top 250 Movies', '/films/fl_hight/?sort=popularity&'),
'genre': {'genre': 'by Genre',
'action': ('Action', '/films/film_genre/bojevik/?'),
@@ -110,9 +110,9 @@ class CXZ(Content.Content):
def isScrappable(self):
return True
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = []
url = self.get_url(category, subcategory, page, self.baseurl)
url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers)
+3 -3
View File
@@ -22,7 +22,7 @@ import Content, re
class EZTV(Content.Content):
category_dict = {
'hot': ('Hot & New', '/', {'page': '/page_%d', 'increase': 1, 'second_page': 1}),
'hot': ('Most Recent', '/', {'page': '/page_%d', 'increase': 1, 'second_page': 1}),
}
baseurl = "https://eztv.ch"
@@ -52,9 +52,9 @@ class EZTV(Content.Content):
def isSearchOption(self):
return False
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = []
url = self.get_url(category, subcategory, page, self.baseurl)
url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers)
+3 -14
View File
@@ -32,7 +32,7 @@ class FastTorrent(Content.Content):
'cartoons': ('Cartoons', '/last-multfilm-torrent/',
{'page': '/last-multfilm-torrent/%d.html', 'increase': 1, 'second_page': 2}),
'anime': ('Anime', '/anime/multfilm/', {'page': '/anime/multfilm/%d.html', 'increase': 1, 'second_page': 2}),
'hot': ('Hot & New', '/new-films/', {'page': '/new-films/%d.html', 'increase': 1, 'second_page': 2}),
'hot': ('Most Recent', '/new-films/', {'page': '/new-films/%d.html', 'increase': 1, 'second_page': 2}),
'genre': {'genre': 'by Genre',
'amime_series': ('Anime Series', '/anime-serialy/multfilm/',
{'page': '/anime-serialy/multfilm/%d.html', 'increase': 1, 'second_page': 2}),
@@ -66,20 +66,9 @@ class FastTorrent(Content.Content):
def isPages(self):
return True
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = []
if not subcategory or subcategory == True:
get = self.category_dict[category]
else:
get = self.category_dict[category][subcategory]
if not page or page == 1:
url = self.baseurl + get[1]
else:
property = self.get_property(category, subcategory)
page_url = property['page'] % (property['second_page'] + ((page - 2) * property['increase']))
url = self.baseurl + str(page_url)
url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers)
+4 -4
View File
@@ -27,13 +27,13 @@ from BeautifulSoup import BeautifulSoup
class IMDB(Content.Content):
category_dict = {
'movies': ('Forieng Movies', '/search/title?languages=en|1&title_type=feature&sort=moviemeter,asc'),
'movies': ('Movies', '/search/title?languages=en|1&title_type=feature&sort=moviemeter,asc'),
'rus_movies': ('Russian Movies', '/search/title?languages=ru|1&title_type=feature&sort=moviemeter,asc'),
'tvshows': ('TV Shows', '/search/title?count=100&title_type=tv_series,mini_series&ref_=gnr_tv_mp'),
'cartoons': ('Cartoons', '/search/title?genres=animation&title_type=feature&sort=moviemeter,asc'),
'anime': ('Anime',
'/search/title?count=100&genres=animation&keywords=anime&num_votes=1000,&explore=title_type&ref_=gnr_kw_an'),
'hot': ('Hot & New', '/search/title?count=100&title_type=feature%2Ctv_series%2Ctv_movie&ref_=nv_ch_mm_1'),
'hot': ('Most Recent', '/search/title?count=100&title_type=feature%2Ctv_series%2Ctv_movie&ref_=nv_ch_mm_1'),
'top': ('Top 250 Movies', '/chart/top/'),
'search': ('[B]Search[/B]', '/find?q=%s&s=tt&ttype=ft'),
'year': {'year': 'by Year', },
@@ -93,9 +93,9 @@ class IMDB(Content.Content):
def isScrappable(self):
return True
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = []
url = self.get_url(category, subcategory, page, self.baseurl)
url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers)
+17 -6
View File
@@ -22,10 +22,18 @@ import Content
class KickAssSo(Content.Content):
category_dict = {
'hot': ('Hot & New', '/new/', {'page': '/new/%d/', 'increase': 1, 'second_page': 2}),
'anime': ('Anime', '/anime/', {'page': '/anime/%d/', 'increase': 1, 'second_page': 2}),
'tvshows': ('TV Shows', '/tv/', {'page': '/tv/%d/', 'increase': 1, 'second_page': 2}),
'movies': ('Forieng Movies', '/movies/', {'page': '/movies/%d/', 'increase': 1, 'second_page': 2}),
'hot': ('Most Recent', '/new/', {'page': '/new/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
'anime': ('Anime', '/anime/', {'page': '/anime/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
'tvshows': ('TV Shows', '/tv/', {'page': '/tv/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
'movies': ('Movies', '/movies/', {'page': '/movies/%d/', 'increase': 1, 'second_page': 2,
'sort':[{'name':'by Seeders', 'url_after':'?field=seeders&sorder=desc'},
{'name':'by Date', 'url_after':'?field=time_add&sorder=desc'}]}),
}
baseurl = "http://kickass.so"
@@ -52,12 +60,15 @@ class KickAssSo(Content.Content):
def isPages(self):
return True
def isSort(self):
return True
def isSearchOption(self):
return False
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = []
url = self.get_url(category, subcategory, page, self.baseurl)
url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers)
+4 -4
View File
@@ -30,10 +30,10 @@ class KinoPoisk(Content.Content):
'tvshows': ('TV Shows', '/top/serial/list/'),
'cartoons': ('Cartoons', '/top/id_genre/14/'),
'search': ('[B]Search[/B]', '/s/type/film/list/1/find/%s/'),
'movies': ('Forieng Movies', '/s/type/film/list/1/m_act[country]/1/m_act[type]/film/'),
'movies': ('Movies', '/s/type/film/list/1/m_act[country]/1/m_act[type]/film/'),
'rus_movies': ('Russian Movies', '/s/type/film/list/1/m_act[country]/2/m_act[type]/film/'),
'anime': ('Anime', '/s/type/film/list/1/order/rating/m_act[genre][0]/1750/',),
'hot': ('Hot & New', '/popular/'),
'hot': ('Most Recent', '/popular/'),
'top': ('Top 250 Movies', '/top/'),
'genre': {'genre': 'by Genre',
'russia': ('Russia & USSR', '/top/rus/list/'),
@@ -99,10 +99,10 @@ class KinoPoisk(Content.Content):
def isScrappable(self):
return True
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
socket.setdefaulttimeout(15)
contentList = []
url = self.get_url(category, subcategory, page, self.baseurl)
url = self.get_url(category, subcategory, apps_property)
#print url
response = self.makeRequest(url, headers=self.headers)
+3 -3
View File
@@ -28,7 +28,7 @@ class RiperAM(Content.Content):
#'tvshows':('TV Shows', '/top/serial/list/'),
#'cartoons':('Cartoons', '/top/id_genre/14/'),
#'anime':('Anime', '/search/title?count=100&genres=animation&keywords=anime&num_votes=1000,&explore=title_type&ref_=gnr_kw_an'),
'hot': ('Hot & New', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}),
'hot': ('Most Recent', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}),
#'top':('Top 250 Movies', '/top/'),
}
@@ -60,9 +60,9 @@ class RiperAM(Content.Content):
def isSearchOption(self):
return False
def get_contentList(self, category, subcategory=None, page=None):
def get_contentList(self, category, subcategory=None, apps_property=None):
contentList = []
url = self.get_url(category, subcategory, page, self.baseurl)
url = self.get_url(category, subcategory, apps_property)
response = self.makeRequest(url, headers=self.headers)