projects
/
id3fs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c59f9ef
)
s/File/AudioFile/: fixup code to use new name
author
Ian Beckwith
<ianb@erislabs.net>
Sun, 26 Sep 2010 02:29:10 +0000
(
03:29
+0100)
committer
Ian Beckwith
<ianb@erislabs.net>
Sun, 26 Sep 2010 02:29:10 +0000
(
03:29
+0100)
lib/ID3FS/AudioFile.pm
patch
|
blob
|
history
lib/ID3FS/AudioFile/Flac.pm
patch
|
blob
|
history
lib/ID3FS/AudioFile/Mp3.pm
patch
|
blob
|
history
lib/ID3FS/AudioFile/Ogg.pm
patch
|
blob
|
history
lib/ID3FS/DB.pm
patch
|
blob
|
history
diff --git
a/lib/ID3FS/AudioFile.pm
b/lib/ID3FS/AudioFile.pm
index
91462ba
..
b2e5709
100644
(file)
--- a/
lib/ID3FS/AudioFile.pm
+++ b/
lib/ID3FS/AudioFile.pm
@@
-1,10
+1,10
@@
-package ID3FS::File;
+package ID3FS::
Audio
File;
use strict;
use warnings;
use strict;
use warnings;
-use ID3FS::File::Mp3;
-use ID3FS::File::Ogg;
-use ID3FS::File::Flac;
+use ID3FS::
Audio
File::Mp3;
+use ID3FS::
Audio
File::Ogg;
+use ID3FS::
Audio
File::Flac;
# omg a factory class, I feel vaguely dirty
sub new
# omg a factory class, I feel vaguely dirty
sub new
@@
-15,15
+15,15
@@
sub new
$ext=lc($ext);
if($ext eq "mp3")
{
$ext=lc($ext);
if($ext eq "mp3")
{
- return ID3FS::File::Mp3->new($path);
+ return ID3FS::
Audio
File::Mp3->new($path);
}
elsif($ext eq "ogg")
{
}
elsif($ext eq "ogg")
{
- return ID3FS::File::Ogg->new($path);
+ return ID3FS::
Audio
File::Ogg->new($path);
}
elsif($ext eq "flac")
{
}
elsif($ext eq "flac")
{
- return ID3FS::File::Flac->new($path);
+ return ID3FS::
Audio
File::Flac->new($path);
}
else
{
}
else
{
diff --git
a/lib/ID3FS/AudioFile/Flac.pm
b/lib/ID3FS/AudioFile/Flac.pm
index
ebe4ea8
..
c2e821f
100644
(file)
--- a/
lib/ID3FS/AudioFile/Flac.pm
+++ b/
lib/ID3FS/AudioFile/Flac.pm
@@
-1,4
+1,4
@@
-package ID3FS::File::Flac;
+package ID3FS::
Audio
File::Flac;
use strict;
use warnings;
use strict;
use warnings;
diff --git
a/lib/ID3FS/AudioFile/Mp3.pm
b/lib/ID3FS/AudioFile/Mp3.pm
index
2ed8e24
..
d6597d0
100644
(file)
--- a/
lib/ID3FS/AudioFile/Mp3.pm
+++ b/
lib/ID3FS/AudioFile/Mp3.pm
@@
-1,4
+1,4
@@
-package ID3FS::File::Mp3;
+package ID3FS::
Audio
File::Mp3;
use strict;
use warnings;
use strict;
use warnings;
diff --git
a/lib/ID3FS/AudioFile/Ogg.pm
b/lib/ID3FS/AudioFile/Ogg.pm
index
ed6c17a
..
3df6950
100644
(file)
--- a/
lib/ID3FS/AudioFile/Ogg.pm
+++ b/
lib/ID3FS/AudioFile/Ogg.pm
@@
-1,4
+1,4
@@
-package ID3FS::File::Ogg;
+package ID3FS::
Audio
File::Ogg;
use strict;
use warnings;
use strict;
use warnings;
diff --git
a/lib/ID3FS/DB.pm
b/lib/ID3FS/DB.pm
index
054a1b1
..
858e068
100644
(file)
--- a/
lib/ID3FS/DB.pm
+++ b/
lib/ID3FS/DB.pm
@@
-3,7
+3,7
@@
package ID3FS::DB;
use strict;
use warnings;
use DBI;
use strict;
use warnings;
use DBI;
-use ID3FS::File;
+use ID3FS::
Audio
File;
use Cwd;
our $SCHEMA_VERSION=1;
use Cwd;
our $SCHEMA_VERSION=1;
@@
-373,7
+373,7
@@
sub add
{
($pathpart, $filepart) = ($relpath =~ /(.*)\/(.*)/);
}
{
($pathpart, $filepart) = ($relpath =~ /(.*)\/(.*)/);
}
- my $file=ID3FS::File->new($path);
+ my $file=ID3FS::
Audio
File->new($path);
return unless(defined($file));
my $artist=$file->artist();
my $album=$file->album();
return unless(defined($file));
my $artist=$file->artist();
my $album=$file->album();