sub bare_tags
{
my($self)=@_;
- my $sql=("SELECT tags.name FROM tags\n" .
- "WHERE tags.parents_id=''\n" .
- "GROUP BY tags.name\n");
+ my $sql=("SELECT t1.name FROM tags t1\n" .
+ "LEFT JOIN tags t2 on t1.id=t2.parents_id\n" .
+ "WHERE t1.parents_id='' AND t2.id IS NULL\n" .
+ "GROUP BY t1.name\n");
my @names=$self->cmd_firstcol($sql);
return (@names);
}
my $audiotype=$file->audiotype();
my @tags=$file->tags();
my $haspic=$file->haspic();
+ my $channels=$file->channels();
+ my $bitrate=$file->bitrate();
+ my $samplerate=$file->samplerate();
$artist=undef unless($self->ok($artist));
print "$self->{me}: $path: no artist tag defined\n" unless(defined($artist));
my $artist_id=$self->add_to_table("artists", $artist);
my $path_id=$self->add_to_table("paths", $pathpart);
$album=undef unless($self->ok($album));
- if($self->{verbose} && !defined($album))
+# if($self->{verbose} && !defined($album)) FIXME
+ if(!defined($album))
{
print "$self->{me}: $path: no album tag defined\n";
}
{ "artists_id" => $artist_id,
"albums_id" => $albums_id,
"paths_id" => $path_id });
- for my $tag (@tags)
+ if(@tags)
{
- $self->add_tag($file_id, @$tag);
+ for my $tag (@tags)
+ {
+ $self->add_tag($file_id, @$tag);
+ }
+ }
+ else
+ {
+ $self->add_tag($file_id, "UNTAGGED");
}
- $year="UNKNOWN" unless($self->ok($year));
+ $year="UNKNOWN" if(!$self->ok($year) || $year =~ /^0+$/);
+ $year+=1900 if($year=~/^\d\d$/);
$self->add_tag($file_id, "year", $year);
if($year=~/^(\d\d\d)\d$/)
{
{
$self->add_tag($file_id, "audiotype", $audiotype);
}
+ else
+ {
+ # should never happen
+ $self->add_tag($file_id, "audiotype", "UNKNOWN");
+ }
+
+ if($self->ok($channels))
+ {
+ if ($channels eq "2") { $channels="stereo"; }
+ elsif ($channels eq "1") { $channels="mono"; }
+ elsif ($channels eq "0") { $channels="UNKNOWN"; }
+ $self->add_tag($file_id, "channels", $channels);
+ }
+
+ if($self->ok($bitrate))
+ {
+ $bitrate="UNKNOWN" if($bitrate=~/^0+$/);
+ $self->add_tag($file_id, "bitrate", $bitrate);
+ }
+
+ if($self->ok($samplerate))
+ {
+ $samplerate="UNKNOWN" if($samplerate=~/^0+$/);
+ $self->add_tag($file_id, "samplerate", $samplerate);
+ }
+
}
sub add_tag
CREATE TABLE paths (
id INTEGER,
name text,
- PRIMARY KEY(id DESC)
+ PRIMARY KEY(id ASC)
);
CREATE TABLE artists (
id INTEGER,
name text,
- PRIMARY KEY(id DESC)
+ PRIMARY KEY(id ASC)
);
CREATE TABLE albums (
id INTEGER,
name text,
- PRIMARY KEY(id DESC)
+ PRIMARY KEY(id ASC)
);
CREATE TABLE files (
artists_id,
albums_id,
paths_id,
- PRIMARY KEY(id DESC),
+ PRIMARY KEY(id ASC),
FOREIGN KEY(artists_id) REFERENCES artists(id) ON DELETE CASCADE ON UPDATE CASCADE,
FOREIGN KEY(albums_id) REFERENCES albums(id) ON DELETE CASCADE ON UPDATE CASCADE,
FOREIGN KEY(paths_id) REFERENCES paths(id) ON DELETE CASCADE ON UPDATE CASCADE
id INTEGER,
parents_id INTEGER,
name text,
- PRIMARY KEY(id DESC)
+ PRIMARY KEY(id ASC)
);
CREATE TABLE files_x_tags (