summaryrefslogtreecommitdiff
path: root/build_db.plx
diff options
context:
space:
mode:
Diffstat (limited to 'build_db.plx')
-rwxr-xr-xbuild_db.plx24
1 files changed, 4 insertions, 20 deletions
diff --git a/build_db.plx b/build_db.plx
index b9bca12..e98423a 100755
--- a/build_db.plx
+++ b/build_db.plx
@@ -7,6 +7,8 @@ use DBI;
use Audio::Scan;
use File::HomeDir;
+require "./shared.pl";
+
# Keep track of columns that need to be created in the database
our %columns;
@@ -64,24 +66,6 @@ sub build_extension_hash {
}
}
-# Wrapper to handle sqlite commands
-# @_[0] -> database handle
-# @_[1] -> command/statement
-# @_[2] (optional) -> output statement
-sub db_cmd {
- my $rv = $_[0]->do($_[1]);
- if ($rv < 0){
- die $DBI::errstr;
- }
-
- # DEBUG
- if (!$options{quiet} and defined $_[2]){
- print "$_[2]\n";
- }
-
- return $rv;
-}
-
# Scan a directory recursively, return an array of files (optionally, matching a certain file extension or extensions)
# @_[0] -> $music_dir
@@ -252,8 +236,8 @@ if (!$options{append}){
# If appending, add columns where necessary
else {
for my $i (sort(keys %columns)){
- $statement = "SELECT COUNT(*) AS CNTREC FROM pragma_table_info('$table_name') WHERE name=\"$i\";";
- if (db_cmd($dbh, $statement) > 0){
+ $statement = "SELECT COUNT(*) AS CNTREC FROM pragma_table_info('$table_name') WHERE name='$i';";
+ if (db_cmd($dbh, $statement) == 0){
$statement = "ALTER TABLE $table_name ADD COLUMN \"$i\";";
db_cmd($dbh, $statement);
}