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

Check for album's with artist in title

Browse Source 
Fixes #1788 and #1666
This commit is contained in:
piejanssens
2014-08-06 19:59:59 +02:00
parent 0cd4d540aa
commit c95bb9d29c
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/searcher.py
+31 -20
View File
@@ -29,7 +29,7 @@ import string
import shutil import shutil
import requests import requests
import subprocess import subprocess
import unicodedata
import headphones import headphones
from headphones.common import USER_AGENT from headphones.common import USER_AGENT
@@ -147,6 +147,11 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False):
if data and bestqual: if data and bestqual:
send_to_downloader(data, bestqual, album) send_to_downloader(data, bestqual, album)
def removeDisallowedFilenameChars(filename):
validFilenameChars = "-_.() %s%s" % (string.ascii_letters, string.digits)
cleanedFilename = unicodedata.normalize('NFKD', filename).encode('ASCII', 'ignore').lower()
return ''.join(c for c in cleanedFilename if c in validFilenameChars)
def more_filtering(results, album, albumlength, new): def more_filtering(results, album, albumlength, new):
low_size_limit = None low_size_limit = None
@@ -174,33 +179,39 @@ def more_filtering(results, album, albumlength, new):
if headphones.PREFERRED_BITRATE_ALLOW_LOSSLESS: if headphones.PREFERRED_BITRATE_ALLOW_LOSSLESS:
allow_lossless = True allow_lossless = True
if low_size_limit or high_size_limit or new: newlist = []
newlist = [] for result in results:
for result in results: normalizedAlbumArtist = removeDisallowedFilenameChars(album['ArtistName'])
normalizedAlbumTitle = removeDisallowedFilenameChars(album['AlbumTitle'])
normalizedResultTitle = removeDisallowedFilenameChars(result[0]);
artistTitleCount = normalizedResultTitle.count(normalizedAlbumArtist)
if low_size_limit and (int(result[1]) < low_size_limit): if normalizedAlbumArtist in normalizedAlbumTitle and artistTitleCount < 2:
logger.info("%s from %s is too small for this album - not considering it. (Size: %s, Minsize: %s)", result[0], result[3], helpers.bytes_to_mb(result[1]), helpers.bytes_to_mb(low_size_limit)) continue
if low_size_limit and (int(result[1]) < low_size_limit):
logger.info("%s from %s is too small for this album - not considering it. (Size: %s, Minsize: %s)", result[0], result[3], helpers.bytes_to_mb(result[1]), helpers.bytes_to_mb(low_size_limit))
continue
if high_size_limit and (int(result[1]) > high_size_limit):
logger.info("%s from %s is too large for this album - not considering it. (Size: %s, Maxsize: %s)", result[0], result[3], helpers.bytes_to_mb(result[1]), helpers.bytes_to_mb(high_size_limit))
# Keep lossless results if there are no good lossy matches
if not (allow_lossless and 'flac' in result[0].lower()):
continue continue
if high_size_limit and (int(result[1]) > high_size_limit): if new:
logger.info("%s from %s is too large for this album - not considering it. (Size: %s, Maxsize: %s)", result[0], result[3], helpers.bytes_to_mb(result[1]), helpers.bytes_to_mb(high_size_limit)) alreadydownloaded = myDB.select('SELECT * from snatched WHERE URL=?', [result[2]])
# Keep lossless results if there are no good lossy matches if len(alreadydownloaded):
if not (allow_lossless and 'flac' in result[0].lower()): logger.info('%s has already been downloaded from %s. Skipping.' % (result[0], result[3]))
continue continue
if new: newlist.append(result)
alreadydownloaded = myDB.select('SELECT * from snatched WHERE URL=?', [result[2]])
if len(alreadydownloaded): results = newlist
logger.info('%s has already been downloaded from %s. Skipping.' % (result[0], result[3]))
continue
newlist.append(result)
results = newlist
return results return results