Changeset 24 in flacrip for trunk/lib

Timestamp:

10/08/14 21:47:47 (10 years ago)

Author:

peter

Message:

• converted Tracks from Class::Std to Moose
• added a has_tracks() method to Tracks

Location:

trunk/lib

Files:

• Ripper.pm (modified) (2 diffs)
• Tracks.pm (modified) (5 diffs)

trunk/lib/Ripper.pm

@@ -12 +12 @@
 has tracks => ( 
     is => 'rw',
-    handles => [qw{read_disc get_tracks get_cuesheet}],
+    handles => [qw{read_disc has_tracks get_cuesheet}],
 );
 
@@ -21 +21 @@
     $self->read_disc($self->device);
 
-    die "No tracks found; is there a CD in the drive?\n" unless @{ $self->get_tracks };
+    die "No tracks found; is there a CD in the drive?\n" unless $self->has_tracks;
 
     my $tempdir = tempdir(CLEANUP => 1);

trunk/lib/Tracks.pm

@@ -1 +1 @@
 package Tracks;
 
-use strict;
-use warnings;
-
-use Class::Std;
+use Moose;
 use Digest::SHA1;
-use Audio::FLAC::Header;
 
 use constant SECTOR_OFFSET => 150;
 
-my %tracks_for :ATTR( get => 'tracks' );
+has tracks => (
+    is      => 'rw',
+    default => sub { [] },
+);
 
 sub _get_tracks_from_cdinfo {    
@@ -66 +65 @@
 sub read_disc {
     my ($self, $device) = @_;
-    $tracks_for{ident $self} = [ _get_tracks_from_cdparanoia($device) ];
+    $self->tracks([ _get_tracks_from_cdparanoia($device) ]);
+}
+
+sub has_tracks {
+    my $self = shift;
+    return @{ $self->tracks } > 0;
 }
 
@@ -72 +76 @@
     my ($self) = @_;
 
-    my @tracks = @{ $tracks_for{ident $self} };
+    my @tracks = @{ $self->tracks };
 
     return unless @tracks;
@@ -95 +99 @@
 sub get_cuesheet {
     my ($self) = @_;
-    my @tracks = @{ $tracks_for{ident $self} };
+    my @tracks = @{ $self->tracks };
     my @cuesheet;
     push @cuesheet, qq{FILE "cdda.wav" WAVE};
@@ -112 +116 @@
     my ($self) = @_;
     # use a msf start unless track 1 begins at sector
-    return $tracks_for{ident $self}[1]{sector} == 0 ? '1-' : '00:00.00-';
+    return $self->tracks->[1]{sector} == 0 ? '1-' : '00:00.00-';
 }