remove/disable some debug prints

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index 93f1de7..05b5f4f 100644 (file)
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -151,7 +151,6 @@ sub tags
     my $main_sql_end=")\n\tGROUP BY t2.name;";
     while(my $constraint=shift @constraints)
     {
-       print "CONSTRAINT: $constraint->{name}\n";
        my $cid=$constraint->{id};
        push(@ids, $cid);
     }
@@ -199,7 +198,6 @@ sub artists
                      "\n\tGROUP BY artists.name;");
     while(my $constraint=shift @constraints)
     {
-       print "CONSTRAINT: $constraint->{name}\n";
        my $cid=$constraint->{id};
        push(@ids, $cid);
     }
@@ -233,7 +231,6 @@ sub albums
                      "\n\tGROUP BY albums.name;");
     while(my $constraint=shift @constraints)
     {
-       print "CONSTRAINT: $constraint->{name}\n";
        my $cid=$constraint->{id};
        push(@ids, $cid);
     }
@@ -241,7 +238,6 @@ sub albums
     my $str=join(", ", @ids);
     my $sql = ($main_sql_start . $str .
               $main_sql_end);
-    print "SQL: $sql\n";
     my $result=$self->cmd_rows($sql);
     my @names=map { $_->[0]; } @$result;
     print "ALBUMS: ", join(', ', @names), "\n";
@@ -325,7 +321,6 @@ sub tracks
     my @ids;
     while(my $constraint=shift @constraints)
     {
-       print "CONSTRAINT: $constraint->{name}\n";
        my $cid=$constraint->{id};
        push(@ids, $cid);
     }
@@ -361,7 +356,6 @@ sub filename
 sub id
 {
     my($self, $type, $val)=@_;
-    print "ID: $type $val\n";
     my $sql="SELECT id FROM $type WHERE name=?";
     my ($id)=$self->cmd_onerow($sql, $val);
     return($id);

diff --git a/lib/ID3FS/Fuse.pm b/lib/ID3FS/Fuse.pm
index 732dd71..264cf87 100644 (file)
--- a/lib/ID3FS/Fuse.pm
+++ b/lib/ID3FS/Fuse.pm
@@ -63,7 +63,7 @@ sub run
 sub getattr
 {
     my($self, $filename)=@_;
-    print "**GETATTR: $filename\n";
+#    print "**GETATTR: $filename\n";
     my $path=ID3FS::Path->new($self->{db}, $filename);
     my $last_update=$self->{db}->last_update();
     return(-ENOENT()) unless($path->isvalid());
@@ -81,7 +81,7 @@ sub getattr
 sub readlink
 {
     my($self,$filename)=@_;
-    print "**READLINK: $filename\n";
+#    print "**READLINK: $filename\n";
     my $path=ID3FS::Path->new($self->{db}, $filename);
     return(-EINVAL()) unless($path->isfile());
     return $path->dest();
@@ -90,7 +90,7 @@ sub readlink
 sub getdir
 {
     my($self, $filename)=@_;
-    print "**GETDIR: $filename\n";
+#    print "**GETDIR: $filename\n";
     my $path=ID3FS::Path->new($self->{db}, $filename);
     return(-ENOENT()) unless($path->isvalid());
     if($path->isdir())

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 6665122..7107ac7 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -23,7 +23,7 @@ sub new
     $self->{db}=shift;
     $self->{path}=shift;
     $self->parse();
-    print "STATE: ", $self->state(), "\n";
+#    print "STATE: ", $self->state(), "\n";
     return $self;
 }
 
@@ -66,7 +66,7 @@ sub dirents
     my($self)=@_;
     my @dents=();
     my $state=$self->state();
-    print "DIRENTS: STATE: $state\n";
+#    print "DIRENTS: STATE: $state\n";
     if($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
        my $tag=$self->{elements}->[$#{$self->{elements}}];
@@ -75,12 +75,10 @@ sub dirents
           ref($tag) eq "ID3FS::PathElement::Tag" &&
           $self->{db}->tag_has_values($tag->{id}))
        {
-           print "DIRENTS: TAG: TAGVALUES\n";
            @dents=$self->{db}->tag_values($tag->{id});
        }
        else
        {
-           print "DIRENTS: TAG/TAGVAL($state): ARTISTS\n";
            @dents=(qw(AND ALLTRACKS), # FIXME: NOT and OR
                    $self->{db}->artists(@{$self->{elements}}));
        }
@@ -113,8 +111,7 @@ sub parse
     my($self)=@_;
     @{$self->{components}}=split(/\//, $self->{path});
     shift @{$self->{components}}; # drop empty field before leading /
-    print "PATH: $self->{path}\n";
-#    print "COMPONENTS: ", join(' | ', @{$self->{components}}), "\n";
+#    print "PATH: $self->{path}\n";
     $self->state($STATE_ROOT);
     return if($self->{path} eq "/");
     my @parts=@{$self->{components}};
@@ -122,16 +119,16 @@ sub parse
     $self->{elements}=[];
     while(my $name=shift @parts)
     {
-       print "NAME: $name\n";
+#      print "NAME: $name\n";
        my $state=$self->state();
        if($state==$STATE_INVALID)
        {
-           print "SM: INVALID: $name\n";
+#          print "SM: INVALID: $name\n";
            return;
        }
        elsif($state==$STATE_ROOT)
        {
-           print "SM: ROOT: $name\n";
+#          print "SM: ROOT: $name\n";
            if($name eq "ALL")
            {
                $self->state($STATE_TAG);
@@ -152,7 +149,7 @@ sub parse
        }
        elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
        {
-           print "SM: TAG/TAGVAL($state): $name\n";
+#          print "SM: TAG/TAGVAL($state): $name\n";
            my $tag=$self->{elements}->[$#{$self->{elements}}];
            if($state==$STATE_TAG &&
               defined($tag) &&
@@ -206,7 +203,7 @@ sub parse
        }
        elsif($state==$STATE_BOOLEAN)
        {
-           print "SM: BOOLEAN: $name\n";
+#          print "SM: BOOLEAN: $name\n";
            my $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
            if($tag)
            {
@@ -220,7 +217,7 @@ sub parse
        }
        elsif($state==$STATE_ALBUMS)
        {
-           print "SM: ALBUM: $name\n";
+#          print "SM: ALBUM: $name\n";
            if($name eq "TRACKS")
            {
                $self->state($STATE_TRACKLIST);
@@ -241,7 +238,7 @@ sub parse
        }
        elsif($state==$STATE_TRACKLIST)
        {
-           print "SM: TRACKLIST: $name\n";
+#          print "SM: TRACKLIST: $name\n";
            my $track=ID3FS::PathElement::File->new($self->{db}, $name);
            push(@{$self->{elements}}, $track);
            if($track)
@@ -256,7 +253,7 @@ sub parse
        }
        elsif($state==$STATE_FILE)
        {
-           print "SM: FILE: $name\n";
+#          print "SM: FILE: $name\n";
            # Can't have anything after a filename
            $self->state($STATE_INVALID);
        }

diff --git a/lib/ID3FS/PathElement/Album.pm b/lib/ID3FS/PathElement/Album.pm
index 7543d5b..46836aa 100644 (file)
--- a/lib/ID3FS/PathElement/Album.pm
+++ b/lib/ID3FS/PathElement/Album.pm
@@ -14,8 +14,6 @@ sub new
     $self->{name}=shift;
     $self->{id}=($self->{db}->id("albums", $self->{name}));
     return(undef) unless(defined($self->{id}));
-    print "Artist ID: $self->{id}\n";
-
     return $self;
 }
 

diff --git a/lib/ID3FS/PathElement/Artist.pm b/lib/ID3FS/PathElement/Artist.pm
index 9f5abfd..9bcf4aa 100644 (file)
--- a/lib/ID3FS/PathElement/Artist.pm
+++ b/lib/ID3FS/PathElement/Artist.pm
@@ -14,8 +14,6 @@ sub new
     $self->{name}=shift;
     $self->{id}=($self->{db}->id("artists", $self->{name}));
     return(undef) unless(defined($self->{id}));
-    print "Artist ID: $self->{id}\n";
-
     return $self;
 }
 

diff --git a/lib/ID3FS/PathElement/File.pm b/lib/ID3FS/PathElement/File.pm
index 71f1a10..6987440 100644 (file)
--- a/lib/ID3FS/PathElement/File.pm
+++ b/lib/ID3FS/PathElement/File.pm
@@ -14,8 +14,6 @@ sub new
     $self->{name}=shift;
     $self->{id}=$self->{db}->id("files", $self->{name});
     return(undef) unless(defined($self->{id}));
-    print "File ID: $self->{id}\n";
-
     return $self;
 }
 

diff --git a/lib/ID3FS/PathElement/Tag.pm b/lib/ID3FS/PathElement/Tag.pm
index 6fc7978..3464261 100644 (file)
--- a/lib/ID3FS/PathElement/Tag.pm
+++ b/lib/ID3FS/PathElement/Tag.pm
@@ -14,7 +14,6 @@ sub new
     $self->{name}=shift;
     $self->{id}=($self->{db}->id("tags", $self->{name}));
     return(undef) unless(defined($self->{id}));
-    print "TAG ID: $self->{id}\n";
     return($self);
 }