KomSuite/KomSuite-NyaaPy
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

SonarQube fixes

Browse Source
This commit is contained in:
Juanjo Salvador
2018-04-20 22:24:06 +02:00
parent 5368b3bef7
commit b9622a2920
1 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
NyaaPy/utils.py
View File

@@ -77,37 +77,32 @@ class Utils:
torrents = [] torrents = []
for row in table_rows[:limit]: for row in table_rows[:limit]:
block = [] block = []
for td in row.find_all('td'): for td in row.find_all('td'):
if td.find_all('a'): for link in td.find_all('a'):
for link in td.find_all('a'): if link.get('href')[-9:] != '#comments':
if link.get('href')[-9:] != '#comments': block.append(link.get('href'))
block.append(link.get('href')) block.append(link.text.rstrip())
if link.text.rstrip():
block.append(link.text)
if td.text.rstrip(): if td.text.rstrip():
block.append(td.text.rstrip()) block.append(td.text.rstrip())
try: torrent = {
torrent = { 'id': block[1].replace("/view/", ""),
'id': block[1].replace("/view/", ""), 'category': Utils.nyaa_categories(block[0]),
'category': Utils.nyaa_categories(block[0]), 'url': "http://nyaa.si{}".format(block[1]),
'url': "http://nyaa.si{}".format(block[1]), 'name': block[2],
'name': block[2], 'download_url': "http://nyaa.si{}".format(block[4]),
'download_url': "http://nyaa.si{}".format(block[4]), 'magnet': block[5],
'magnet': block[5], 'size': block[6],
'size': block[6], 'date': block[7],
'date': block[7], 'seeders': block[8],
'seeders': block[8], 'leechers': block[9],
'leechers': block[9], 'completed_downloads': block[10],
'completed_downloads': block[10], }
}
torrents.append(torrent)
torrents.append(torrent)
except IndexError as ie:
pass
return torrents return torrents
@@ -149,37 +144,32 @@ class Utils:
torrents = [] torrents = []
for row in table_rows[:limit]: for row in table_rows[:limit]:
block = [] block = []
for td in row.find_all('td'): for td in row.find_all('td'):
if td.find_all('a'): for link in td.find_all('a'):
for link in td.find_all('a'): if link.get('href')[-9:] != '#comments':
if link.get('href')[-9:] != '#comments': block.append(link.get('href'))
block.append(link.get('href')) block.append(link.text.rstrip())
if link.text.rstrip():
block.append(link.text)
if td.text.rstrip(): if td.text.rstrip():
block.append(td.text.rstrip()) block.append(td.text.rstrip())
try:
torrent = {
'id': block[1].replace("/view/", ""),
'category': Utils.sukebei_categories(block[0]),
'url': "http://sukebei.nyaa.si{}".format(block[1]),
'name': block[2],
'download_url': "http://sukebei.nyaa.si{}".format(block[4]),
'magnet': block[5],
'size': block[6],
'date': block[7],
'seeders': block[8],
'leechers': block[9],
'completed_downloads': block[10],
}
torrents.append(torrent) torrent = {
except IndexError as ie: 'id': block[1].replace("/view/", ""),
pass 'category': Utils.sukebei_categories(block[0]),
'url': "http://sukebei.nyaa.si{}".format(block[1]),
'name': block[2],
'download_url': "http://sukebei.nyaa.si{}".format(block[4]),
'magnet': block[5],
'size': block[6],
'date': block[7],
'seeders': block[8],
'leechers': block[9],
'completed_downloads': block[10],
}
torrents.append(torrent)
return torrents return torrents
@@ -227,15 +217,14 @@ class Utils:
if param in available_params: if param in available_params:
if param != "category" and param != "status" and param != "lang": if param != "category" and param != "status" and param != "lang":
query += "&{}={}".format(param, value) query += "&{}={}".format(param, value)
else: elif param == "category":
if param == "category": query += "&c={}_{}".format(value[0], value[1])
query += "&c={}_{}".format(value[0], value[1])
elif param == "status":
if param == "status": query += "&s={}".format(value)
query += "&s={}".format(value)
elif param == "lang":
if param == "lang": for lang in value:
for lang in value: query += "&lang={}".format(lang)
query += "&lang={}".format(lang)
return query return query