diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-04-21 03:21:20 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-04-21 03:21:20 +0000 |
| commit | 310adfa35923938b97ea416cd21c431d64eaa05a (patch) | |
| tree | 245aba68464905bdb5d0072918aa0f5b621290cb /bin | |
| parent | 67981be0c675d0685bc6e986e6cf5e5fb6cae611 (diff) | |
| download | ampache-310adfa35923938b97ea416cd21c431d64eaa05a.tar.gz ampache-310adfa35923938b97ea416cd21c431d64eaa05a.tar.bz2 ampache-310adfa35923938b97ea416cd21c431d64eaa05a.zip | |
last commit before beta3 release
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sort_files.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/sort_files.inc b/bin/sort_files.inc index 3a1d71cc..01ed030d 100644 --- a/bin/sort_files.inc +++ b/bin/sort_files.inc @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2006 Ampache.org + Copyright (c) Ampache.org All rights reserved This program is free software; you can redistribute it and/or @@ -32,7 +32,7 @@ */ /* Don't do anything just tell me what you would do */ -$test_mode = true; +//$test_mode = true; /* m(__)m */ $alphabet_prefix = true; @@ -46,13 +46,14 @@ ob_end_clean(); /* First Clean the catalog to we don't try to write anything we shouldn't */ -$sql = "SELECT id FROM catalog WHERE catalog_type='local'"; +$sql = "SELECT `id` FROM `catalog` WHERE `catalog_type`='local'"; $db_results = Dba::query($sql); $catalogs = array(); while ($r = Dba::fetch_row($db_results)) { + $catalog = new Catalog($r['0']); $songs = $catalog->get_catalog_files(); @@ -256,13 +257,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 (!conf('album_art_preferred_filename')) { + if (!Config::get('album_art_preferred_filename')) { $folder_art = $directory . '/folder.jpg'; $old_art = $old_dir . '/folder.jpg'; } else { - $folder_art = $directory . "/" . conf('album_art_preferred_filename'); - $old_art = $old_dir . "/" . conf('album_art_preferred_filename'); + $folder_art = $directory . "/" . Config::get('album_art_preferred_filename'); + $old_art = $old_dir . "/" . Config::get('album_art_preferred_filename'); } debug_event('copy_art','Copied ' . $old_art . ' to ' . $folder_art,'5'); |