diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-01-01 04:24:56 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-01-01 04:24:56 +0000 |
| commit | 93b1be95c90992dfe5d89beba2ee5a53884b709d (patch) | |
| tree | 05d03b7694af02c9d68e048fa25f9405282c48dc | |
| parent | 83b534b820f742d75c0580bce7811ddf7e72ef92 (diff) | |
| download | ampache-93b1be95c90992dfe5d89beba2ee5a53884b709d.tar.gz ampache-93b1be95c90992dfe5d89beba2ee5a53884b709d.tar.bz2 ampache-93b1be95c90992dfe5d89beba2ee5a53884b709d.zip | |
fix the sort files script to handle variable folder art names and enable final db update for alpha1
| -rw-r--r-- | bin/sort_files.inc | 6 | ||||
| -rw-r--r-- | lib/class/update.class.php | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bin/sort_files.inc b/bin/sort_files.inc index 69aa1a1e..41271d79 100644 --- a/bin/sort_files.inc +++ b/bin/sort_files.inc @@ -254,13 +254,13 @@ function sort_move_file($song,$fullname) { debug_event('copy','Copied ' . $song->file . ' to ' . $fullname,'5'); /* Look for the folder art and copy that as well */ - if (!Config::get('album_art_preferred_filename')) { + if (!Config::get('album_art_preferred_filename') OR strstr(Config::get('album_art_preferred_filename'),"%")) { $folder_art = $directory . '/folder.jpg'; $old_art = $old_dir . '/folder.jpg'; } else { - $folder_art = $directory . "/" . Config::get('album_art_preferred_filename'); - $old_art = $old_dir . "/" . Config::get('album_art_preferred_filename'); + $folder_art = $directory . "/" . sort_clean_name(Config::get('album_art_preferred_filename')); + $old_art = $old_dir . "/" . sort_clean_name(Config::get('album_art_preferred_filename')); } debug_event('copy_art','Copied ' . $old_art . ' to ' . $folder_art,'5'); diff --git a/lib/class/update.class.php b/lib/class/update.class.php index e3e6d92d..fd22f326 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -288,6 +288,12 @@ class Update { $version[] = array('version' => '350002','description'=>$update_string); + $update_string = '- Modify Tag tables.<br />' . + '- Remove useless config preferences.<br />'; + + $version[] = array('version'=> '350003','description'=>$update_string); + + return $version; @@ -1421,7 +1427,6 @@ class Update { $sql = "DELETE FROM `preference` WHERE `name`='mystrands_user' OR `name`='mystrands_pass'"; $db_results = Dba::write($sql); - self::set_version('db_version','350003'); return true; |