mirror of
https://github.com/bspeice/Melodia
synced 2024-12-25 08:08:13 -05:00
Fix a bug where scanning would add the same file many times
This commit is contained in:
parent
870efac03f
commit
944593be94
@ -66,11 +66,14 @@ class Archive (models.Model):
|
|||||||
if re.match(regex, filename):
|
if re.match(regex, filename):
|
||||||
#Make sure that `filename` is in the database
|
#Make sure that `filename` is in the database
|
||||||
try:
|
try:
|
||||||
self.songs.get(url = filename)
|
rel_url = os.path.join(dirname, filename)
|
||||||
|
full_url = os.path.abspath(rel_url)
|
||||||
|
self.songs.get(url = full_url)
|
||||||
|
|
||||||
except ObjectDoesNotExist, e:
|
except ObjectDoesNotExist, e:
|
||||||
#Song needs to be added to database
|
#Song needs to be added to database
|
||||||
full_url = os.path.join(dirname, filename)
|
rel_url = os.path.join(dirname, filename)
|
||||||
|
full_url = os.path.abspath(rel_url)
|
||||||
new_song = Song(url = full_url)
|
new_song = Song(url = full_url)
|
||||||
new_song.save()
|
new_song.save()
|
||||||
self.songs.add(new_song)
|
self.songs.add(new_song)
|
||||||
@ -131,10 +134,10 @@ class Archive (models.Model):
|
|||||||
def reorganize(self, format_string, progress_function = lambda w, x, y, z: None, dry_run = False):
|
def reorganize(self, format_string, progress_function = lambda w, x, y, z: None, dry_run = False):
|
||||||
"""Reorganize a music archive using a specified format string.
|
"""Reorganize a music archive using a specified format string.
|
||||||
Recognized escape characters:
|
Recognized escape characters:
|
||||||
%a - Artist Name %A - Album Name
|
%a - Artist Name %A - Album Name
|
||||||
%d - Disc Number %e - Number of discs
|
%d - Disc Number %e - Number of discs
|
||||||
%f - Current Filename (no extension) %g - Current Filename (with extension)
|
%f - Current Filename (with extension) %g - Current Filename (no extension)
|
||||||
%n - Track Number %o - Number of tracks on disc
|
%n - Track Number %o - Number of tracks on disc
|
||||||
%y - Album year
|
%y - Album year
|
||||||
|
|
||||||
Note that all organization takes place relative to the archive's root folder.
|
Note that all organization takes place relative to the archive's root folder.
|
||||||
@ -153,13 +156,13 @@ class Archive (models.Model):
|
|||||||
|
|
||||||
new_location = format_string.replace("%a", song.artist)\
|
new_location = format_string.replace("%a", song.artist)\
|
||||||
.replace("%A", song.album)\
|
.replace("%A", song.album)\
|
||||||
.replace("%d", song.disc_number)\
|
.replace("%d", str(song.disc_number))\
|
||||||
.replace("%e", song.disc_total)\
|
.replace("%e", str(song.disc_total))\
|
||||||
.replace("%f", _current_filename)\
|
.replace("%f", _current_filename)\
|
||||||
.replace("%g", _current_filename_no_extension)\
|
.replace("%g", _current_filename_no_extension)\
|
||||||
.replace("%n", song.track_number)\
|
.replace("%n", str(song.track_number))\
|
||||||
.replace("%o", song.track_total)\
|
.replace("%o", str(song.track_total))\
|
||||||
.replace("%y", _release_year)
|
.replace("%y", str(_release_year))
|
||||||
|
|
||||||
new_url = os.path.join(self.root_folder, new_location)
|
new_url = os.path.join(self.root_folder, new_location)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user