Skip to content

Fix cpasbien #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomahoax wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix cpasbien #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fccce9
Fix NZBClub URL
tomahoax Jan 20, 2016
a9723cd
Merge pull request #1 from tomahoax/tomahoax-patch-nzbclub-url
tomahoax Jan 20, 2016
0543e6a
Changed domain name for cpasbien
tomahoax Sep 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions couchpotato/core/media/_base/providers/nzb/binnewz/nzbclub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class NZBClub(NZBDownloader, NZBProvider, RSS):

urls = {
'search': 'http://www.nzbclub.com/nzbfeeds.aspx?%s',
'search': 'https://www.nzbclub.com/nzbrss.aspx?%s',
}

http_time_between_calls = 4 #seconds
Expand Down Expand Up @@ -61,4 +61,4 @@ def extra_check(item):

return NZBGetURLSearchResult( self, downloadUrl, sizeInMegs, nzbClubURL, age, nzbid)



54 changes: 27 additions & 27 deletions couchpotato/core/media/_base/providers/torrent/cpasbien.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
class Base(TorrentProvider):

urls = {
'test': 'http://www.cpasbien.io/',
'search': 'http://www.cpasbien.io/recherche/',
'test': 'http://www.cpasbien.cm/',
'search': 'http://www.cpasbien.cm/recherche/',
}

http_time_between_calls = 1 #seconds
Expand All @@ -44,25 +44,25 @@ def _search(self, movie, quality, results):


TitleStringReal = (getTitle(movie['info']) + ' ' + simplifyString(quality['identifier'] )).replace('-',' ').replace(' ',' ').replace(' ',' ').replace(' ',' ').encode("utf8")

URL = (self.urls['search']).encode('UTF8')
URL=unicodedata.normalize('NFD',unicode(URL,"utf8","replace"))
URL=URL.encode('ascii','ignore')
URL = urllib2.quote(URL.encode('utf8'), ":/?=")

values = {
'champ_recherche' : TitleStringReal
}

data_tmp = urllib.urlencode(values)
req = urllib2.Request(URL, data_tmp, headers={'User-Agent' : "Mozilla/5.0"} )

data = urllib2.urlopen(req )

id = 1000

if data:

try:
html = BeautifulSoup(data)
lin=0
Expand All @@ -83,24 +83,24 @@ def _search(self, movie, quality, results):
for result in resultdiv:

try:

new = {}
name = result.findAll(attrs = {'class' : ["titre"]})[0].text
testname=namer_check.correctName(name,movie)
if testname==0:
continue
detail_url = result.find("a")['href']
tmp = detail_url.split('/')[-1].replace('.html','.torrent')
url_download = ('http://www.cpasbien.io/telechargement/%s' % tmp)
url_download = ('http://www.cpasbien.cm/telechargement/%s' % tmp)
size = result.findAll(attrs = {'class' : ["poid"]})[0].text
seeder = result.findAll(attrs = {'class' : ["seed_ok"]})[0].text
leecher = result.findAll(attrs = {'class' : ["down"]})[0].text
age = '1'

verify = getTitle(movie['info']).split(' ')

add = 1

for verify_unit in verify:
if (name.lower().find(verify_unit.lower()) == -1) :
add = 0
Expand All @@ -114,23 +114,23 @@ def extra_check(item):
new['name'] = name.strip()
new['url'] = url_download
new['detail_url'] = detail_url

new['size'] = self.parseSize(size)
new['age'] = self.ageToDays(age)
new['seeders'] = tryInt(seeder)
new['leechers'] = tryInt(leecher)
new['extra_check'] = extra_check
new['download'] = self.loginDownload
new['download'] = self.loginDownload

#new['score'] = fireEvent('score.calculate', new, movie, single = True)

#log.error('score')
#log.error(new['score'])

results.append(new)

id = id+1

except:
log.error('Failed parsing cPASbien: %s', traceback.format_exc())

Expand Down Expand Up @@ -174,7 +174,7 @@ def login(self):
]

try:
response = opener.open('http://www.cpasbien.io', tryUrlencode({'url': '/'}))
response = opener.open('http://www.cpasbien.cm', tryUrlencode({'url': '/'}))
except urllib2.URLError as e:
log.error('Login to cPASbien failed: %s' % e)
return False
Expand All @@ -186,33 +186,33 @@ def login(self):
else:
log.error('Login to cPASbien failed: returned code %d' % response.getcode())
return False


def loginDownload(self, url = '', nzb_id = ''):
values = {
'url' : '/'
}
data_tmp = urllib.urlencode(values)
req = urllib2.Request(url, data_tmp, headers={'User-Agent' : "Mozilla/5.0"} )

try:
if not self.last_login_check and not self.login():
log.error('Failed downloading from %s', self.getName())
return urllib2.urlopen(req).read()
except:
log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc()))

def download(self, url = '', nzb_id = ''):

if not self.last_login_check and not self.login():
return

values = {
'url' : '/'
}
data_tmp = urllib.urlencode(values)
req = urllib2.Request(url, data_tmp, headers={'User-Agent' : "Mozilla/5.0"} )

try:
return urllib2.urlopen(req).read()
except:
Expand All @@ -224,7 +224,7 @@ def download(self, url = '', nzb_id = ''):
'tab': 'searcher',
'list': 'torrent_providers',
'name': 'cpasbien',
'description': 'See <a href="http://www.cpasbien.io/">cPASbien</a>',
'description': 'See <a href="http://www.cpasbien.cm/">cPASbien</a>',
'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAgZJREFUOI2lkj9oE2EYxn93l/Quf440gXg4lBoEMd2MDuLSkk0R6hCnuqjUoR0c7FDo4Ca0CDo7uRRBqEMDXSLUUqRDiZM1NMEI1VKTlDZpUppccvc5nJp/KooPfMPH+z3P+zzv+8F/Quq8XIVEEOY0kASIzpoLlBKUV+CuCblfCjyF/P3V1Qi6jrCs7k4eD/X1dS5NTy9tQaJD2MFDkA23W8UwQFGQRJcB0DS0cBg/DPY4a0OVZcHeHihKf1ifD6pVfGD/VmBAUeDwEGQZLAskCVQV6nVYW+M4lSLQo9stoKpQLoNtO2QhYHsbkkmOczm+AP5eBy/BfwRDn8GHJLkpFp3utRpkMpDLwckJvlCIM9Uqg6YZeAAj58E1CVlXCaaigcCjsWhU8Xq9UCo5lisVx4FhODFkGbdpMtlqXa4IsVUHYkLcVlbg3ddGo3AzErl2emLCGaCmwcAAuL4ntCxoNpFsG8O2odlkXojF17CgAK2PsJna2Xk/ViyOh0dHXWhaewaW1T6mSb5a5V6rtbAMU4D5c18FyCzu7i5fyWZvDMfjOh4PNBpd5A/5vLheq93ZhMc/eF0Lr0NhaX8/eS6djo/EYqfQdUekUuHNxsZR4uDg1id40f9J+qE/CwTeitlZIWZmxKtQqOSFi39D7IQy5/c/fxIMpoGhfyUDMAwXzsL4n958A9jfxsJ8X4WQAAAAAElFTkSuQmCC',
'wizard': True,
'options': [
Expand Down