X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FPath.pm;h=0455375d406350c4e215a6b9e2de0cb0850cf5d1;hb=816412478a46e87db92c44a11101cc4b0b172325;hp=60b628ff9f0ab51030cd735eedc57f11cf21d8ea;hpb=7009392ead613e8ad7f6a2c1ab7105d6ec2ef91b;p=id3fs.git

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 60b628f..0455375 100644
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -52,8 +52,7 @@ sub isdir
 sub isfile
 {
     my($self)=@_;
-    return 1 if($self->state() == $STATE_FILE);
-    return 0;
+    return($self->state() == $STATE_FILE);
 }
 
 sub isvalid
@@ -67,7 +66,7 @@ sub dest
     my($self, $mountpoint)=@_;
     if($self->state() == $STATE_FILE)
     {
-	return $self->filename($mountpoint, $self);
+	return $self->filename($mountpoint);
     }
     return "ERROR"; #should never happen?
 }
@@ -82,7 +81,7 @@ sub dirents
 #    print "DIRENTS: FILE: $self->{path}\n";
     if($state==$STATE_ALL)
     {
-	push(@dents, $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+	@dents=($PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
     }
     elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
@@ -96,7 +95,7 @@ sub dirents
 	}
 	else
 	{
-	    push(@dents, qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+	    @dents=(qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
 	}
     }
     elsif($state==$STATE_BOOLEAN)
@@ -106,9 +105,9 @@ sub dirents
 	       ref($parent) eq "ID3FS::PathElement::Boolean" &&
 	       $parent->{name} eq "NOT")
 	{
-	    push(@dents, "NOT");
+	    @dents=("NOT");
 	}
-	push(@dents, $self->tags());
+	push(@dents,$self->tags());
     }
     elsif($state==$STATE_ROOT)
     {
@@ -443,7 +442,7 @@ sub used_tags
     return($self->{tagtree}->used_tags());
 }
 
-sub tag_has_values
+sub expecting_values
 {
     my($self)=@_;
     my $tail=$self->tail();
@@ -493,12 +492,12 @@ sub tail_parent
 sub tags
 {
     my($self)=@_;
-    if(!$self->{tagtree}) # / or /NOT  # FIXME: /ALL too?
+    if(!$self->{tagtree}) # / or /NOT
     {
 	my $sql="SELECT DISTINCT name FROM tags WHERE parents_id='';";
 	return($self->{db}->cmd_firstcol($sql));
     }
-    my $hasvals=$self->tag_has_values();
+    my $hasvals=$self->expecting_values();
     my $parent=$self->trailing_tag_parent();
 #    print "THASVALS: $hasvals\n";
 #    print "TPARENT: ", (defined($parent)? $parent : "NO"), "\n";
@@ -568,16 +567,6 @@ sub tags
     return(@tagnames);
 }
 
-sub tag_values
-{
-    my($self, $tagid)=@_;
-    my $sql=("SELECT DISTINCT name FROM tags\n" .
-	     "WHERE parents_id=?");
-    my @tags=$self->{db}->cmd_firstcol($sql, $tagid);
-    @tags=map { length($_) ? $_ : "NOVALUE"; } @tags;
-    return @tags;
-}
-
 sub artists
 {
     my($self)=@_;
@@ -587,11 +576,8 @@ sub artists
 	return($self->{db}->cmd_firstcol($sql));
     }
     my @ids=();
-    my $sql=("SELECT artists.name FROM (\n" .
-	     $self->tags_subselect() .
-	     ") AS subselect\n" .
-	     "INNER JOIN files ON subselect.files_id=files.id\n" .
-	     "INNER JOIN artists ON files.artists_id=artists.id\n" .
+    my $sql=$self->sql_start("artists.name");
+    $sql .= ("INNER JOIN artists ON files.artists_id=artists.id\n" .
 	     "WHERE artists.name != ''\n" .
 	     "GROUP BY artists.name;");
     print "SQL(ARTISTS): $sql\n" if($self->{verbose});
@@ -610,22 +596,10 @@ sub albums
     {
 	return $self->artist_albums($tail->{id});
     }
-    my $sql;
-    if($self->{in_all})
-    {
-	$sql="SELECT name FROM albums";
-    }
-    else
-    {
-	$sql=("SELECT albums.name\n" .
-	      "\tFROM (\n" .
-	      $self->tags_subselect() .
-	      "\t) AS subselect\n" .
-	      "INNER JOIN files ON subselect.files_id=files.id\n" .
-	      "INNER JOIN albums ON files.albums_id=albums.id\n" .
-	      "WHERE albums.name != ''\n" .
-	      "GROUP BY albums.name;");
-    }
+    my $sql=$self->sql_start("albums.name");
+    $sql .= ("INNER JOIN albums ON files.albums_id=albums.id\n" .
+	     "WHERE albums.name != ''\n" .
+	     "GROUP BY albums.name;");
     print "SQL(ALBUMS): \n$sql\n" if($self->{verbose});
     my @names=$self->{db}->cmd_firstcol($sql);
     print("ALBUMS: ", join(', ', @names), "\n") if($self->{verbose});
@@ -635,18 +609,7 @@ sub albums
 sub artist_albums
 {
     my($self, $artist_id)=@_;
-    my $sql="SELECT albums.name FROM ";
-    if($self->{in_all})
-    {
-	$sql .= "files\n";
-    }
-    else
-    {
-	$sql .= ("(\n" .
-		 $self->tags_subselect() .
-		 ") AS subselect\n" .
-		 "INNER JOIN files ON subselect.files_id=files.id\n");
-    }
+    my $sql=$self->sql_start("albums.name");
     $sql .= ("INNER JOIN albums ON albums.id=files.albums_id\n" .
 	     "INNER JOIN artists ON artists.id=files.artists_id\n" .
 	     "WHERE artists.id=? and albums.name <> ''\n" .
@@ -660,18 +623,7 @@ sub artist_albums
 sub artist_tracks
 {
     my($self, $artist_id)=@_;
-    my $sql="SELECT files.name FROM ";
-    if($self->{in_all})
-    {
-	$sql .= "files\n";
-    }
-    else
-    {
-	$sql .= ("(\n" .
-		 $self->tags_subselect() .
-		 "\t) AS subselect\n" .
-		 "INNER JOIN files ON subselect.files_id=files.id\n");
-    }
+    my $sql=$self->sql_start("files.name");
     $sql .= ("INNER JOIN artists ON artists.id=files.artists_id\n" .
 	     "INNER JOIN albums  ON albums.id=files.albums_id\n" .
 	     "WHERE artists.id=? AND albums.name=''\n" .
@@ -716,18 +668,7 @@ sub tracks
 	}
 	return $self->album_tracks($artist_id, $tail->{id});
     }
-    my $sql="SELECT files.name FROM ";
-    if($self->{in_all})
-    {
-	$sql .= "files\n";
-    }
-    else
-    {
-	$sql .= ("(\n" .
-		 $self->tags_subselect() .
-		 ") AS subselect\n" .
-		 "INNER JOIN files ON files.id=subselect.files_id\n");
-    }
+    my $sql=$self->sql_start("files.name");
     $sql .= "INNER JOIN artists ON files.artists_id=artists.id\n";
     if($self->{components}->[$#{$self->{components}}] eq $PATH_NOARTIST)
     {
@@ -754,7 +695,7 @@ sub filename
 	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));
+	return($self->{db}->relativise($path, $name, $mountpoint));
     }
     die("DB::filename: unhandled case\n"); #FIXME
 }
@@ -762,7 +703,7 @@ sub filename
 sub tags_subselect
 {
     my($self)=@_;
-    my $hasvals=$self->tag_has_values();
+    my $hasvals=$self->expecting_values();
     # we need to specially handle a bare /NOT/tag with no other clauses,
     # using a simple WHERE id !='tagid' instead of a LEFT JOIN
     if($self->{bare_not})
@@ -836,109 +777,24 @@ sub bare_not_subselect
     return($sql);
 }
 
-sub tags_subselect_and_not
-{
-    my($self,@constraints)=@_;
-    my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
-    my @tags=@$tags;
-    my @tags_vals=@$tags_vals;;
-    my $cnt=1;
-    my @andclauses=();
-    my $sql='';
-    for my $tag (@tags)
-    {
-	if($cnt == 1)
-	{
-	    $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
-	    push(@andclauses, "\t\tfxt${cnt}.tags_id=$tag");
-	}
-	else
-	{
-	    $sql .= ("\tLEFT JOIN files_x_tags fxt$cnt ON fxt" .
-		 ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
-	    push(@andclauses, "\t\tfxt${cnt}.tags_id IS NULL");
-	}
-	print "AND: @andclauses\n";
-	$cnt++;
-    }
-    if(@andclauses)
-    {
-	$sql .= "\tWHERE\n\t\t";
-	$sql .= join(" AND\n\t\t", @andclauses) . "\n";
-    }
-    $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
-    return $sql;
-}
-
-
-sub tags_subselect_and
+sub sql_start
 {
-    my($self,@constraints)=@_;
-    my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
-    my @tags=@$tags;
-    my @tags_vals=@$tags_vals;;
-    my $cnt=1;
-    my @andclauses=();
-    my $sql='';
-    for my $tag (@tags)
+    my($self, $tables)=@_;
+    my $sql="SELECT $tables FROM ";
+    if($self->{in_all})
     {
-	if($cnt == 1)
-	{
-	    $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
-	}
-	else
-	{
-	    $sql .= ("\tINNER JOIN files_x_tags fxt$cnt ON fxt" .
-		 ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
-	}
-	push(@andclauses, "\t\tfxt${cnt}.tags_id = $tag");
-	print "AND: @andclauses\n";
-	$cnt++;
+	$sql .= "files\n";
     }
-    if(@andclauses)
+    else
     {
-	$sql .= "\tWHERE\n\t\t";
-	$sql .= join(" AND\n\t\t", @andclauses) . "\n";
+	$sql .= ("(\n" .
+		 $self->tags_subselect() .
+		 ") AS subselect\n" .
+		 "INNER JOIN files ON subselect.files_id=files.id\n");
     }
-    $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
     return $sql;
 }
 
-sub tags_subselect_or
-{
-    my($self,@constraints)=@_;
-    my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
-    my @tags=@$tags;
-    my @tags_vals=@$tags_vals;;
-
-    my $sql=("\tSELECT files_x_tags.files_id FROM tags t1\n" .
-	     "\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n");
-    my @orclauses=();
-    my @andclauses=();
-    # FIXME: and / or?
-    if(@tags)
-    {
-	push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
-	push(@andclauses, "( t1.id IN ( " . join(', ', @tags) ." ) )");
-    }
-    for my $pair (@tags_vals)
-    {
-	my($tag, $val)=@$pair;
-	push(@orclauses, "( t1.parents_id=$tag AND t1.id=$val )");
-    }
-#    push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
-    if(@orclauses)
-    {
-	push(@andclauses, join("\n\t\tOR ", @orclauses));
-    }
-    if(@andclauses)
-    {
-	$sql .= "\tWHERE\n\t\t";
-	$sql .= join("\n\t\tAND ", @andclauses) . "\n";
-    }
-    $sql .= "\tGROUP BY files_x_tags.files_id\n";
-    return $sql;
-}
 
 sub constraints_tag_list
 {
@@ -978,35 +834,7 @@ sub constraints_tag_list
     return(\@tags, \@tags_vals, $lasttag);
 }
 
-
-sub bare_tags
-{
-    my($self)=@_;
-    my $sql=("SELECT tags.name FROM tags\n" .
-	     "WHERE tags.parents_id=''\n" .
-	     "GROUP BY tags.name\n");
-    my @names=$self->{db}->cmd_firstcol($sql);
-    return (@names);
-}
-
-sub tags_with_values
-{
-    # FIXME: only shows one level of tag depth
-    my($self)=@_;
-    my $sql=("SELECT p.name, t.name  FROM tags t\n" .
-	     "INNER JOIN tags p ON t.parents_id=p.id\n" .
-	     "GROUP BY p.name, t.name\n");
-#    print "SQL: $sql\n";
-    my $result=$self->{db}->cmd_rows($sql);
-    my $tags={};
-    for my $pair (@$result)
-    {
-	push(@{$tags->{$pair->[0]}}, $pair->[1]);
-    }
-    return $tags;
-}
-
-
+# Not used, slows things down too much
 sub filter
 {
     my($self, @dirs)=@_;
@@ -1016,14 +844,14 @@ sub filter
     my $maxdepth=4;
     for my $dir (@dirs)
     {
-#	print "FILTER (",$self->state(), "): $base / $dir\n";
+#	print "\nFILTER (",$self->state(), "): $base / $dir\n";
 	if($self->empty("$base/$dir", $maxdepth))
 	{
 #	    print "empty: $base / $dir\n";
 	}
 	else
 	{
-#	    print "accepting: $base / $dir\n";
+#	    print "non-empty, accepting: $base / $dir\n";
 	    push(@outdirs, $dir);
 	}
     }
@@ -1033,7 +861,7 @@ sub filter
 sub empty
 {
     my($self, $dir, $maxdepth)=@_;
-    return 1 unless($maxdepth);
+    return 0 unless($maxdepth);
 #    print "testing($maxdepth): $dir\n";
     my $path=ID3FS::Path->new($self->{db}, $dir, $self->{verbose});
 #    print "PATH INVALID\n" unless($path->isvalid());
@@ -1066,21 +894,13 @@ sub empty
     return 1;
 }
 
-sub tagname_has_values
-{
-    my($self, $name)=@_;
-    my $id=$self->{db}->lookup_id("tags", $name);
-    return 0 unless($id);
-    return $self->{db}->tag_has_values($id);
-
-}
-
 sub dir_is_special
 {
     my($self, $dir)=@_;
-    if((grep { $_ eq $dir; }
-	qw(AND OR NOT), $PATH_ALLTRACKS, $PATH_NOARTIST, $PATH_NOALBUM) ||
-       ($self->tagname_has_values($dir)))
+    my $id=$self->{db}->lookup_id("tags", $dir);
+    if((grep { $_ eq $dir; } (qw(AND OR NOT), $PATH_ALLTRACKS,
+			      $PATH_NOARTIST, $PATH_NOALBUM)) ||
+       ($id && $self->{db}->tag_has_values($id)))
     {
 	return 1;
     }