From 8fd631f96b4077a92ae440db4440f810bcf654b1 Mon Sep 17 00:00:00 2001 From: theguardian Date: Sun, 13 Oct 2013 13:45:10 -0700 Subject: [PATCH] Cleaned up unnecessary code. No longer suggested that users run a comprehensive active artist update on first-run. --- data/interfaces/default/manage.html | 3 -- headphones/importer.py | 54 ++++++++--------------------- headphones/mb.py | 3 ++ headphones/searcher.py | 2 ++ headphones/updater.py | 12 +------ 5 files changed, 21 insertions(+), 53 deletions(-) diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html index 7d680c1d..6d98bb53 100644 --- a/data/interfaces/default/manage.html +++ b/data/interfaces/default/manage.html @@ -147,12 +147,9 @@
Force Legacy

Please note that these functions will take a significant amount of time to complete.

-
Force Update Active Artists [Comprehensive]
- *Warning: If you choose [Force Update Active Artists], artist "extras" will be reset, manual album release matching will be reset, "paused" artists will lose ALL information, and "wanted" albums will be reset to include only recent/future albums. It's recommended you activate all paused artists before running. -

Force Re-scan Library [Comprehensive]
*Warning: If you choose [Force Re-scan Library], any manually ignored/matched artists/albums will be reset to "unmatched". diff --git a/headphones/importer.py b/headphones/importer.py index 10c41abb..45204464 100644 --- a/headphones/importer.py +++ b/headphones/importer.py @@ -199,15 +199,15 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): if len(artist['releasegroups']) != 0 and not extrasonly: for groups in artist['releasegroups']: group_list.append(groups['id']) - remove_missing_groups_from_albums = myDB.action("SELECT AlbumID, ReleaseID FROM albums WHERE ArtistID=?", [artistid]) + remove_missing_groups_from_albums = myDB.action("SELECT AlbumID FROM albums WHERE ArtistID=?", [artistid]) for items in remove_missing_groups_from_albums: - if items['ReleaseID'] not in group_list and items['AlbumID']==items['ReleaseID']: #added 2nd clause for when user picks alternate release + if items['AlbumID'] not in group_list: # Remove all from albums/tracks that aren't in release groups - myDB.action("DELETE FROM albums WHERE ReleaseID=?", [items['ReleaseID']]) - myDB.action("DELETE FROM allalbums WHERE ReleaseID=?", [items['ReleaseID']]) - myDB.action("DELETE FROM tracks WHERE ReleaseID=?", [items['ReleaseID']]) - myDB.action("DELETE FROM alltracks WHERE ReleaseID=?", [items['ReleaseID']]) - logger.info("Removing all references to group %s to reflect MusicBrainz" % items['ReleaseID']) + myDB.action("DELETE FROM albums WHERE AlbumID=?", [items['AlbumID']]) + myDB.action("DELETE FROM allalbums WHERE AlbumID=?", [items['AlbumID']]) + myDB.action("DELETE FROM tracks WHERE AlbumID=?", [items['AlbumID']]) + myDB.action("DELETE FROM alltracks WHERE AlbumID=?", [items['AlbumID']]) + logger.info("Removing all references to group %s to reflect MusicBrainz" % items['AlbumID']) force_repackage = 1 else: logger.info("Error pulling data from MusicBrainz: Maintaining dB") @@ -247,7 +247,7 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): if force_repackage == 1: new_releases = -1 - logger.info('Forcing repackage of %s, since dB groups have been removed' % al_title) + logger.info('Forcing repackage of %s, since release groups have been removed' % al_title) else: new_releases = new_releases else: @@ -260,6 +260,11 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): #print new_releases if new_releases != 0: + #Dump existing hybrid release since we're repackaging/replacing it + myDB.action("DELETE from albums WHERE ReleaseID=?", [rg['id']]) + myDB.action("DELETE from allalbums WHERE ReleaseID=?", [rg['id']]) + myDB.action("DELETE from tracks WHERE ReleaseID=?", [rg['id']]) + myDB.action("DELETE from alltracks WHERE ReleaseID=?", [rg['id']]) # This will be used later to build a hybrid release fullreleaselist = [] #Search for releases within a release group @@ -364,22 +369,6 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): rg_exists = myDB.action("SELECT * from albums WHERE AlbumID=?", [rg['id']]).fetchone() if not rg_exists: releaseid = rg['id'] - elif rg_exists and not rg_exists['ReleaseID']: - # Need to do some importing here - to transition the old format of using the release group - # only to using releasegroup & releaseid. These are the albums that are missing a ReleaseID - # so we'll need to move over the locations, bitrates & formats from the tracks table to the new - # alltracks table. Thankfully we can just use TrackIDs since they span releases/releasegroups - logger.info("Copying current track information to alternate releases") - tracks = myDB.action('SELECT * from tracks WHERE AlbumID=?', [rg['id']]).fetchall() - for track in tracks: - if track['Location']: - controlValueDict = {"TrackID": track['TrackID']} - newValueDict = {"Location": track['Location'], - "BitRate": track['BitRate'], - "Format": track['Format'], - } - myDB.upsert("alltracks", newValueDict, controlValueDict) - releaseid = rg['id'] else: releaseid = rg_exists['ReleaseID'] @@ -415,15 +404,8 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): else: newValueDict['Status'] = "Skipped" - #Only update albums table with hybrid release if user didn't choose an alternate release - check_alternate_release = myDB.action("SELECT AlbumID, ReleaseID FROM albums WHERE ArtistID=? AND AlbumID=?", (artistid, rg['id'])).fetchone() - if check_alternate_release: - if check_alternate_release[0] == check_alternate_release[1]: - myDB.upsert("albums", newValueDict, controlValueDict) - else: - myDB.upsert("albums", newValueDict, controlValueDict) + myDB.upsert("albums", newValueDict, controlValueDict) - myDB.action('DELETE from tracks WHERE AlbumID=?', [rg['id']]) tracks = myDB.action('SELECT * from alltracks WHERE ReleaseID=?', [releaseid]).fetchall() # This is used to see how many tracks you have from an album - to mark it as downloaded. Default is 80%, can be set in config as ALBUM_COMPLETION_PCT @@ -448,13 +430,7 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False): "BitRate": track['BitRate'] } - #Only update tracks table with hybrid release if user didn't choose an alternate release - check_alternate_release = myDB.action("SELECT AlbumID, ReleaseID FROM albums WHERE ArtistID=? AND AlbumID=?", (artistid, rg['id'])).fetchone() - if check_alternate_release: - if check_alternate_release[0] == check_alternate_release[1]: - myDB.upsert("tracks", newValueDict, controlValueDict) - else: - myDB.upsert("tracks", newValueDict, controlValueDict) + myDB.upsert("tracks", newValueDict, controlValueDict) # Mark albums as downloaded if they have at least 80% (by default, configurable) of the album have_track_count = len(myDB.select('SELECT * from tracks WHERE AlbumID=? AND Location IS NOT NULL', [rg['id']])) diff --git a/headphones/mb.py b/headphones/mb.py index 14404816..89578e18 100644 --- a/headphones/mb.py +++ b/headphones/mb.py @@ -389,6 +389,9 @@ def get_new_releases(rgid,includeExtras=False,forcefull=False): album_checker = myDB.action('SELECT * from allalbums WHERE ReleaseID=?', [rel_id_check]).fetchone() if not album_checker or forcefull: + #DELETE all references to this release since we're updating it anyway. + myDB.action('DELETE from allalbums WHERE ReleaseID=?', [rel_id_check]) + myDB.action('DELETE from alltracks WHERE ReleaseID=?', [rel_id_check]) release['AlbumTitle'] = unicode(releasedata['title']) release['AlbumID'] = unicode(rgid) release['AlbumASIN'] = unicode(releasedata['asin']) if 'asin' in releasedata else None diff --git a/headphones/searcher.py b/headphones/searcher.py index 3472499a..69f2fe1f 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -137,6 +137,8 @@ def searchforalbum(albumid=None, new=False, lossless=False): if (headphones.KAT or headphones.PIRATEBAY or headphones.ISOHUNT or headphones.MININOVA or headphones.WAFFLES or headphones.RUTRACKER or headphones.WHATCD) and foundNZB == "none": searchTorrent(albumid, new, lossless) + logger.info('Search for Wanted albums complete') + def searchNZB(albumid=None, new=False, losslessOnly=False): myDB = db.DBConnection() diff --git a/headphones/updater.py b/headphones/updater.py index 49fdadac..6bd0450f 100644 --- a/headphones/updater.py +++ b/headphones/updater.py @@ -21,16 +21,6 @@ def dbUpdate(forcefull=False): myDB = db.DBConnection() - #This can be updated to NOT include: paused artists, artists with extras enabled, wanted albums, albums matched to specific releases, etc - #But it absolutely FLIES if these dB's are destroyed in their entirety. With the new system, there's really no need to pause artists. - if forcefull==True: - myDB.select('DELETE from albums') - myDB.select('DELETE from allalbums') - myDB.select('DELETE from tracks') - myDB.select('DELETE from alltracks') - myDB.select('DELETE from descriptions') - myDB.select('UPDATE artists SET LatestAlbum=?, ReleaseDate=?, AlbumID=?, HaveTracks=?, TotalTracks=?', [None, None, None, None, None]) - activeartists = myDB.select('SELECT ArtistID, ArtistName from artists WHERE Status="Active" or Status="Loading" order by LastUpdated ASC') logger.info('Starting update for %i active artists' % len(activeartists)) @@ -39,4 +29,4 @@ def dbUpdate(forcefull=False): artistid = artist[0] importer.addArtisttoDB(artistid=artistid, extrasonly=False, forcefull=forcefull) - logger.info('Update complete') + logger.info('Active artist update complete')