voussoir
/
etiquette
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add_associated_directory checks for dupe, so remove old check

master
voussoir 2017-05-01 20:50:52 -07:00
parent 06522ee372
commit 8080d92f8d
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etiquette/photodb.py
View File

@ -307,16 +307,6 @@ class PDBAlbumMixin:
raise TypeError('Description must be string, not %s' % type(description)) raise TypeError('Description must be string, not %s' % type(description))
cur = self.sql.cursor() cur = self.sql.cursor()
if associated_directory is not None:
associated_directory = os.path.abspath(associated_directory)
cur.execute(
'SELECT * FROM album_associated_directories WHERE directory == ?',
[associated_directory]
)
fetch = cur.fetchone()
if fetch is not None:
album = self.get_album(fetch[constants.SQL_ALBUM_DIRECTORY['albumid']])
raise exceptions.AlbumExists(album)
self.log.debug('New Album: %s' % title) self.log.debug('New Album: %s' % title)
data = { data = {
@ -327,17 +317,12 @@ class PDBAlbumMixin:
(qmarks, bindings) = helpers.binding_filler(constants.SQL_ALBUM_COLUMNS, data) (qmarks, bindings) = helpers.binding_filler(constants.SQL_ALBUM_COLUMNS, data)
query = 'INSERT INTO albums VALUES(%s)' % qmarks query = 'INSERT INTO albums VALUES(%s)' % qmarks
cur.execute(query, bindings) cur.execute(query, bindings)
album = objects.Album(self, data) album = objects.Album(self, data)
if associated_directory is not None: if associated_directory is not None:
data = { album.add_associated_directory(associated_directory, commit=False)
'albumid': albumid,
'directory': associated_directory,
}
(qmarks, bindings) = helpers.binding_filler(constants.SQL_ALBUM_DIRECTORY_COLUMNS, data)
query = 'INSERT INTO album_associated_directories VALUES(%s)' % qmarks
cur.execute(query, bindings)
if photos is not None: if photos is not None:
for photo in photos: for photo in photos: