id3fsd verbosity: -v => sql, -vv => fuse debugging

[id3fs.git] / lib / ID3FS / Path.pm

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 8284a98..60b628f 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -30,6 +30,7 @@ sub new
     $self->{elements}=[];
     $self->{db}=shift;
     $self->{path}=shift;
+    $self->{verbose}=shift;
     $self->{path} =~ s/\/\//\//g; # drop doubled slashes
 
     $self->parse();
@@ -561,9 +562,9 @@ sub tags
        $sql .= "WHERE " . join(' AND ', @andclauses) . "\n";
     }
     $sql .= "GROUP BY tags.name;";
-#    print "SQL(TAGS): $sql\n";
+    print "SQL(TAGS): $sql\n" if($self->{verbose});
     my @tagnames=$self->{db}->cmd_firstcol($sql);
-#    print "SUBNAMES: ", join(', ', @tagnames), "\n";
+    print("SUBNAMES: ", join(', ', @tagnames), "\n") if($self->{verbose});
     return(@tagnames);
 }
 
@@ -593,9 +594,9 @@ sub artists
             "INNER JOIN artists ON files.artists_id=artists.id\n" .
             "WHERE artists.name != ''\n" .
             "GROUP BY artists.name;");
-#    print "SQL(ARTISTS): $sql\n";
+    print "SQL(ARTISTS): $sql\n" if($self->{verbose});
     my @tagnames=$self->{db}->cmd_firstcol($sql);
-    print "ARTISTS: ", join(', ', @tagnames), "\n";
+    print("ARTISTS: ", join(', ', @tagnames), "\n") if($self->{verbose});
     return(@tagnames);
 }
 
@@ -625,9 +626,9 @@ sub albums
              "WHERE albums.name != ''\n" .
              "GROUP BY albums.name;");
     }
-#    print "SQL(ALBUMS): \n$sql\n";
+    print "SQL(ALBUMS): \n$sql\n" if($self->{verbose});
     my @names=$self->{db}->cmd_firstcol($sql);
-    print "ALBUMS: ", join(', ', @names), "\n";
+    print("ALBUMS: ", join(', ', @names), "\n") if($self->{verbose});
     return(@names);
 }
 
@@ -650,9 +651,9 @@ sub artist_albums
             "INNER JOIN artists ON artists.id=files.artists_id\n" .
             "WHERE artists.id=? and albums.name <> ''\n" .
             "GROUP BY albums.name\n");
-#    print "ARTIST_ALBUMS SQL: $sql\n";
+    print "ARTIST_ALBUMS SQL: $sql\n" if($self->{verbose});
     my @albums=$self->{db}->cmd_firstcol($sql, $artist_id);
-    print "ALBUMS: ", join(', ', @albums), "\n";
+    print("ALBUMS: ", join(', ', @albums), "\n") if($self->{verbose});
     return(@albums);
 }
 
@@ -675,9 +676,9 @@ sub artist_tracks
             "INNER JOIN albums  ON albums.id=files.albums_id\n" .
             "WHERE artists.id=? AND albums.name=''\n" .
             "GROUP BY files.name\n");
-#    print "ARTIST_TRACKS SQL: $sql\n";
+    print "ARTIST_TRACKS SQL: $sql\n" if($self->{verbose});
     my @names=$self->{db}->cmd_firstcol($sql, $artist_id);
-    print "ARTISTTRACKS: ", join(', ', @names), "\n";
+    print("ARTISTTRACKS: ", join(', ', @names), "\n") if($self->{verbose});
     return(@names);
 }
 
@@ -689,9 +690,9 @@ sub album_tracks
             "INNER JOIN artists ON artists.id=files.artists_id\n" .
             "WHERE artists.id=? AND albums.id=?\n" .
             "GROUP BY files.name\n");
-#    print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n";
+    print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n" if($self->{verbose});
     my @names=$self->{db}->cmd_firstcol($sql, $artist_id, $album_id);
-    print "TRACKS: ", join(', ', @names), "\n";
+    print("TRACKS: ", join(', ', @names), "\n") if($self->{verbose});
     return(@names);
 }
 
@@ -733,9 +734,9 @@ sub tracks
        $sql .= "WHERE artists.name =''\n";
     }
     $sql .= "GROUP BY files.name;";
-#    print "TRACKS SQL($self->{path}): $sql\n";
+    print "TRACKS SQL($self->{path}): $sql\n" if($self->{verbose});
     my @names=$self->{db}->cmd_firstcol($sql);
-    print "TRACKS: ", join(', ', @names), "\n";
+    print("TRACKS: ", join(', ', @names), "\n") if($self->{verbose});
     return(@names);
 }
 
@@ -750,7 +751,7 @@ sub filename
                 "INNER JOIN paths ON files.paths_id=paths.id\n" .
                 "WHERE files.id=?\n" .
                 "GROUP BY paths.name, files.name");
-#      print "FILENAME SQL: $sql\n";
+       print "FILENAME SQL: $sql\n" if($self->{verbose});
        my ($path, $name)=$self->{db}->cmd_onerow($sql, $id);
        my $id3fs_path=join('/', map { $_->{name}; }  @{$self->{elements}});
        return($self->{db}->relativise($path, $name, $mountpoint, $id3fs_path));
@@ -1034,7 +1035,7 @@ sub empty
     my($self, $dir, $maxdepth)=@_;
     return 1 unless($maxdepth);
 #    print "testing($maxdepth): $dir\n";
-    my $path=ID3FS::Path->new($self->{db}, $dir);
+    my $path=ID3FS::Path->new($self->{db}, $dir, $self->{verbose});
 #    print "PATH INVALID\n" unless($path->isvalid());
     return 1 unless($path->isvalid());
     my($subdirs,$subfiles)=$path->dirents();