gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-23 11:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Took out logging messages. Took out nzb possibilities from checkFolder since we're doing it in searcher.py anyways

Browse Source
This commit is contained in:
rembo10
2014-04-28 19:52:25 -07:00
parent 3e5779e5ce
commit 3b9816f3b3
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/__init__.py
-1
View File
@@ -1109,7 +1109,6 @@ def start():
SCHED.add_interval_job(versioncheck.checkGithub, minutes=CHECK_GITHUB_INTERVAL)
if DOWNLOAD_SCAN_INTERVAL > 0:
logger.info("download_scan_interval is non-zero - FORTESTING")
SCHED.add_interval_job(postprocessor.checkFolder, minutes=DOWNLOAD_SCAN_INTERVAL)
SCHED.start()
headphones/postprocessor.py
+11 -28
View File
@@ -31,43 +31,26 @@ from headphones import logger, helpers, request, mb, music_encoder
postprocessor_lock = threading.Lock()
def checkFolder():
logger.info("Checking download folder - FORTESTING")
with postprocessor_lock:
myDB = db.DBConnection()
snatched = myDB.select('SELECT * from snatched WHERE Status="Snatched"')
logger.info("Checking snatched albums - FORTESTING")
for album in snatched:
logger.info("Got an album to check for - FORTESTING")
if album['FolderName']:
logger.info("Album has a foldername: %s - FORTESTING" % album['FolderName'])
if album['Kind'] == 'nzb':
# We're now checking sab config options after sending to determine renaming - but we'll keep the
# iterations in just in case we can't read the config for some reason
download_dir = headphones.DOWNLOAD_DIR
else:
download_dir = headphones.DOWNLOAD_TORRENT_DIR
nzb_album_possibilities = [ album['FolderName'],
helpers.sab_replace_dots(album['FolderName']),
helpers.sab_replace_spaces(album['FolderName']),
helpers.sab_replace_spaces(sab_replace_dots(album['FolderName']))
]
logger.info("Made all the nzb possibilities - FORTESTING")
for nzb_folder_name in nzb_album_possibilities:
logger.info("Trying to create bytestring path - FORTESTING")
nzb_album_path = os.path.join(headphones.DOWNLOAD_DIR, nzb_folder_name).encode(headphones.SYS_ENCODING, 'replace')
logger.info("Checking if %s exists" % nzb_album_path)
if os.path.exists(nzb_album_path):
logger.info('Found %s in NZB download folder. Verifying....' % album['FolderName'])
verify(album['AlbumID'], nzb_album_path, 'nzb')
if album['Kind'] == 'torrent':
torrent_album_path = os.path.join(headphones.DOWNLOAD_TORRENT_DIR, album['FolderName']).encode(headphones.SYS_ENCODING,'replace')
logger.info("Checking if %s exists" % torrent_album_path)
if os.path.exists(torrent_album_path):
logger.info('Found %s in torrent download folder. Verifying....' % album['FolderName'])
verify(album['AlbumID'], torrent_album_path, 'torrent')
album_path = os.path.join(download_dir, album['FolderName']).encode(headphones.SYS_ENCODING,'replace')
logger.info("Checking if %s exists" % album_path)
if os.path.exists(album_path):
logger.info('Found "' + album['FolderName'] + '" in ' + album['Kind'] + ' download folder. Verifying....')
verify(album['AlbumID'], torrent_album_path, 'torrent')
else:
logger.info("No folder name found for " + album['Title'])