fixed multiple download links being sent to SAB

This commit is contained in:
Remy
2011-05-24 09:11:48 -07:00
parent dca48bade7
commit bd176a9bc3
3 changed files with 13 additions and 9 deletions

View File

@@ -38,10 +38,10 @@ def itunesImport(pathtoxml):
else:
c.execute('INSERT INTO artists VALUES( ?, ?, ?, CURRENT_DATE, ?)', (artistid, artist.name, artist.sortName, 'Active'))
for release in artist.getReleases():
time.sleep(1)
releaseid = u.extractUuid(release.id)
inc = ws.ReleaseIncludes(artist=True, releaseEvents= True, tracks= True, releaseGroup=True)
results = ws.Query().getReleaseById(releaseid, inc)
time.sleep(1)
for event in results.releaseEvents:
if event.country == 'US':
c.execute('INSERT INTO albums VALUES( ?, ?, ?, ?, ?, CURRENT_DATE, ?, ?)', (artistid, results.artist.name, results.title, results.asin, results.getEarliestReleaseDate(), u.extractUuid(results.id), 'Skipped'))

View File

@@ -77,10 +77,11 @@ def searchNZB(albumid=None):
except:
print '''No results found'''
if len(resultlist):
bestqual = sorted(resultlist, key=lambda title: title[1], reverse=True)[0]
downloadurl = bestqual[2]
linkparams = { "mode": "addurl",
"apikey": sab_apikey,
"ma_username": sab_username,
@@ -88,13 +89,16 @@ def searchNZB(albumid=None):
"cat": sab_category,
"name": downloadurl
}
saburl = 'http://' + sab_host + '/sabnzbd/api?' + urllib.urlencode(linkparams)
urllib.urlopen(saburl)
c.execute('UPDATE albums SET status = "Snatched" WHERE AlbumID="%s"' % albums[2])
conn.commit()
else:
pass
c.close()

View File

@@ -36,6 +36,6 @@ class threadtool(SimplePlugin):
import mover
from webServer import database
if os.path.exists(database):
self.sched.add_cron_job(updater.dbUpdate, hour=3)
self.sched.add_interval_job(searcher.searchNZB, hours=18)
self.sched.add_cron_job(updater.dbUpdate, hour=4, minute=0, second=0)
self.sched.add_interval_job(searcher.searchNZB, hours=12)
#self.sched.add_interval_job(mover.moveFiles, minutes=10)