gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-21 00:14:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Specify Name When Sending to Deluge Module

Browse Source 
- Searcher should send "Artist - Album" string to Deluge so we don't
have to guess the name
This commit is contained in:
Noam
2016-03-03 14:37:55 +02:00
parent 147f62d87a
commit e05699e7ba
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/deluge.py
+29 -27
View File
@@ -72,7 +72,7 @@ def _scrubber(text):
return text return text
def addTorrent(link, data=None): def addTorrent(link, data=None, name=None):
try: try:
# Authenticate anyway # Authenticate anyway
logger.debug('Deluge: addTorrent Authentication') logger.debug('Deluge: addTorrent Authentication')
@@ -121,19 +121,20 @@ def addTorrent(link, data=None):
if 'announce' not in str(torrentfile)[:40]: if 'announce' not in str(torrentfile)[:40]:
logger.debug('Deluge: Contents of %s doesn\'t look like a torrent file' % _scrubber(link)) logger.debug('Deluge: Contents of %s doesn\'t look like a torrent file' % _scrubber(link))
return False return False
# Extract torrent name from .torrent if not name:
try: # Extract torrent name from .torrent
logger.debug('Deluge: Getting torrent name length') try:
name_length = int(re.findall('name([0-9]*)\:.*?\:', str(torrentfile))[0]) logger.debug('Deluge: Getting torrent name length')
logger.debug('Deluge: Getting torrent name') name_length = int(re.findall('name([0-9]*)\:.*?\:', str(torrentfile))[0])
name = re.findall('name[0-9]*\:(.*?)\:', str(torrentfile))[0][:name_length] logger.debug('Deluge: Getting torrent name')
except Exception as e: name = re.findall('name[0-9]*\:(.*?)\:', str(torrentfile))[0][:name_length]
logger.debug('Deluge: Could not get torrent name, getting file name') except Exception as e:
# get last part of link/path (name only) logger.debug('Deluge: Could not get torrent name, getting file name')
name = link.split('\\')[-1].split('/')[-1] # get last part of link/path (name only)
# remove '.torrent' suffix name = link.split('\\')[-1].split('/')[-1]
if name[-len('.torrent'):] == '.torrent': # remove '.torrent' suffix
name = name[:-len('.torrent')] if name[-len('.torrent'):] == '.torrent':
name = name[:-len('.torrent')]
logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name, str(torrentfile)[:40])) logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name, str(torrentfile)[:40]))
result = {'type': 'torrent', result = {'type': 'torrent',
'name': name, 'name': name,
@@ -149,19 +150,20 @@ def addTorrent(link, data=None):
logger.debug('Deluge: Getting .torrent file') logger.debug('Deluge: Getting .torrent file')
with open(link, 'rb') as f: with open(link, 'rb') as f:
torrentfile = f.read() torrentfile = f.read()
# Extract torrent name from .torrent if not name:
try: # Extract torrent name from .torrent
logger.debug('Deluge: Getting torrent name length') try:
name_length = int(re.findall('name([0-9]*)\:.*?\:', str(torrentfile))[0]) logger.debug('Deluge: Getting torrent name length')
logger.debug('Deluge: Getting torrent name') name_length = int(re.findall('name([0-9]*)\:.*?\:', str(torrentfile))[0])
name = re.findall('name[0-9]*\:(.*?)\:', str(torrentfile))[0][:name_length] logger.debug('Deluge: Getting torrent name')
except Exception as e: name = re.findall('name[0-9]*\:(.*?)\:', str(torrentfile))[0][:name_length]
logger.debug('Deluge: Could not get torrent name, getting file name') except Exception as e:
# get last part of link/path (name only) logger.debug('Deluge: Could not get torrent name, getting file name')
name = link.split('\\')[-1].split('/')[-1] # get last part of link/path (name only)
# remove '.torrent' suffix name = link.split('\\')[-1].split('/')[-1]
if name[-len('.torrent'):] == '.torrent': # remove '.torrent' suffix
name = name[:-len('.torrent')] if name[-len('.torrent'):] == '.torrent':
name = name[:-len('.torrent')]
logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name, str(torrentfile)[:40])) logger.debug('Deluge: Sending Deluge torrent with name %s and content [%s...]' % (name, str(torrentfile)[:40]))
result = {'type': 'torrent', result = {'type': 'torrent',
'name': name, 'name': name,
headphones/searcher.py
+2 -2
View File
@@ -895,9 +895,9 @@ def send_to_downloader(data, bestqual, album):
try: try:
# Add torrent # Add torrent
if bestqual[3] == 'rutracker.org': if bestqual[3] == 'rutracker.org':
torrentid = deluge.addTorrent('', data) torrentid = deluge.addTorrent('', data, name=folder_name)
else: else:
torrentid = deluge.addTorrent(bestqual[2]) torrentid = deluge.addTorrent(bestqual[2], name=folder_name)
if not torrentid: if not torrentid:
logger.error("Error sending torrent to Deluge. Are you sure it's running? Maybe the torrent already exists?") logger.error("Error sending torrent to Deluge. Are you sure it's running? Maybe the torrent already exists?")