[mb-commits] r10293 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server MusicBrainz/Server/Facade MusicBrainz/Server/Handlers/WS/1 MusicBrainz/Server/Moderation
root at musicbrainz.org
root at musicbrainz.org
Mon Sep 1 23:55:51 UTC 2008
Author: acid2
Date: 2008-09-01 23:55:51 +0000 (Mon, 01 Sep 2008)
New Revision: 10293
Modified:
mb_server/branches/TemplateToolkit/lib/Insert.pm
mb_server/branches/TemplateToolkit/lib/MM.pm
mb_server/branches/TemplateToolkit/lib/MM_2_0.pm
mb_server/branches/TemplateToolkit/lib/MM_2_1.pm
mb_server/branches/TemplateToolkit/lib/Moderation.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm
mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm
Log:
[GS]etSequence -> sequence
[GS]etSequenceId -> sequence_id
[GS]etLength -> length
(in Track)
Modified: mb_server/branches/TemplateToolkit/lib/Insert.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/Insert.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -463,7 +463,7 @@
# Check to see if the given track exists. If so, check to
# see if a trm id was given. If it was, then insert the
# trmid for this track.
- if ($albumtrack->GetSequence() == $track->{tracknum} &&
+ if ($albumtrack->sequence() == $track->{tracknum} &&
$albumtrack->GetName() eq $track->{track} &&
exists $track->{trmid} && $track->{trmid} ne '')
{
@@ -477,7 +477,7 @@
next TRACK;
}
- if ($albumtrack->GetSequence() == $track->{tracknum} &&
+ if ($albumtrack->sequence() == $track->{tracknum} &&
$albumtrack->GetName() eq $track->{track} &&
exists $track->{puid} && $track->{puid} ne '')
{
@@ -492,7 +492,7 @@
next TRACK;
}
# If a track with that tracknumber already exists, skip the insertion.
- if ($albumtrack->GetSequence() == $track->{tracknum})
+ if ($albumtrack->sequence() == $track->{tracknum})
{
$info->{album_complete} = 0;
next TRACK;
@@ -501,14 +501,14 @@
# Ok, the track passes all the tests. Insert the track.
$tr->SetName($track->{track});
- $tr->SetSequence($track->{tracknum});
+ $tr->sequence($track->{tracknum});
if (exists $track->{year} && $track->{year} != 0)
{
$tr->SetYear($track->{year});
}
if (exists $track->{duration})
{
- $tr->SetLength($track->{duration});
+ $tr->length($track->{duration});
}
# Check to see if this track has an artist that needs to get
Modified: mb_server/branches/TemplateToolkit/lib/MM.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MM.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -222,7 +222,7 @@
$artists{$var->GetId} = $var;
}
}
- push @ids, { id=>$tr->GetMBId, tracknum=>$tr->GetSequence };
+ push @ids, { id=>$tr->GetMBId, tracknum=>$tr->sequence };
}
$out .= $this->OutputAlbumRDF({ obj=>$al, _album=>\@ids });
@@ -600,7 +600,7 @@
push @ret, {%info};
push @trackids, { id=>$track->GetMBId(),
- tracknum=>$track->GetSequence() };
+ tracknum=>$track->sequence() };
}
$ref->{_album} = \@trackids;
}
@@ -617,7 +617,7 @@
# TODO: Should the TRM output also be a seperate depth?
$info{type} = 'artist';
$info{id} = $track->artist();
- $info{tracknum} = $track->GetSequence();
+ $info{tracknum} = $track->sequence();
$info{obj} = undef;
push @ret, {%info};
Modified: mb_server/branches/TemplateToolkit/lib/MM_2_0.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM_2_0.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MM_2_0.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -182,10 +182,10 @@
$out .= $this->Element("dc:creator", "", "rdf:resource",
$this->{baseuri}. "/artist/" . $artist->GetMBId());
- $out .= $this->Element("mm:trackNum", $track->GetSequence());
- if ($track->GetLength() != 0)
+ $out .= $this->Element("mm:trackNum", $track->sequence());
+ if ($track->length() != 0)
{
- $out .= $this->Element("mm:duration", $track->GetLength());
+ $out .= $this->Element("mm:duration", $track->length());
}
foreach $trm (@TRM)
{
Modified: mb_server/branches/TemplateToolkit/lib/MM_2_1.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MM_2_1.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MM_2_1.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -284,9 +284,9 @@
$out .= $this->Element("dc:creator", "", "rdf:resource",
$this->{baseuri}. "/artist/" . $artist->GetMBId())
}
- if ($track->GetLength() != 0)
+ if ($track->length() != 0)
{
- $out .= $this->Element("mm:duration", $track->GetLength());
+ $out .= $this->Element("mm:duration", $track->length());
}
if (defined $album)
{
@@ -429,7 +429,7 @@
next if not defined $track;
push @trackids, { id=>$track->GetMBId(),
- tracknum=>$track->GetSequence() };
+ tracknum=>$track->sequence() };
}
return \@trackids;
Modified: mb_server/branches/TemplateToolkit/lib/Moderation.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/Moderation.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/Moderation.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -1709,7 +1709,7 @@
{
$this->{"trackid"} = $track->GetId;
$this->{"trackname"} = $track->GetName;
- $this->{"trackseq"} = $track->GetSequence;
+ $this->{"trackseq"} = $track->sequence;
# assume that the release needs to be loaded from
# the album-track core relationship, if it not
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Facade/Track.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -28,9 +28,9 @@
$class->new({
artist_id => $track->artist,
- duration => MusicBrainz::Server::Track::FormatTrackLength($track->GetLength),
+ duration => MusicBrainz::Server::Track::FormatTrackLength($track->length),
id => $track->GetId,
- number => $track->GetSequence,
+ number => $track->sequence,
name => $track->GetName,
mbid => $track->GetMBId,
puid_count => 0,
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Handlers/WS/1/Common.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -568,10 +568,10 @@
print '><title>';
print xml_escape($tr->GetName());
print '</title>';
- if ($tr->GetLength())
+ if ($tr->length())
{
print '<duration>';
- print xml_escape($tr->GetLength());
+ print xml_escape($tr->length());
print '</duration>';
}
xml_artist($ar, 0) if (defined $ar);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -41,11 +41,11 @@
my $newseq = $opts{'newseq'} or die;
$self->artist($track->artist);
- $self->SetPrev($track->GetSequence);
+ $self->SetPrev($track->sequence);
$self->SetNew(0+$newseq);
$self->table("albumjoin");
$self->SetColumn("sequence");
- $self->row_id($track->GetSequenceId);
+ $self->row_id($track->sequence_id);
}
sub PostLoad
@@ -110,7 +110,7 @@
return STATUS_FAILEDPREREQ;
}
- unless ($track->GetSequence == $this->GetPrev)
+ unless ($track->sequence == $this->GetPrev)
{
$this->InsertNote(MODBOT_MODERATOR, "This track has already been renumbered");
return STATUS_FAILEDDEP;
@@ -120,7 +120,7 @@
# (but if you do that, it makes it very hard to swap/rotate
# tracks within an album).
- $track->SetSequence($this->GetNew);
+ $track->sequence($this->GetNew);
$track->UpdateSequence;
STATUS_APPLIED;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -41,7 +41,7 @@
my $newlength = $opts{'newlength'};
$self->artist($track->artist);
- $self->SetPrev($track->GetLength);
+ $self->SetPrev($track->length);
$self->SetNew(0+$newlength);
$self->table("track");
$self->SetColumn("length");
@@ -117,13 +117,13 @@
return STATUS_FAILEDPREREQ;
}
- unless ($track->GetLength == $self->GetPrev)
+ unless ($track->length == $self->GetPrev)
{
$self->InsertNote(MODBOT_MODERATOR, "Track time has already been changed");
return STATUS_FAILEDDEP;
}
- $track->SetLength($self->GetNew);
+ $track->length($self->GetNew);
$track->UpdateLength;
STATUS_APPLIED;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Moderation/MOD_REMOVE_TRACK.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -41,7 +41,7 @@
my $al = $opts{'album'} or die;
$self->artist($tr->artist);
- $self->SetPrev($tr->GetName . "\n" . $al->GetId . "\n" . $al->IsNonAlbumTracks . "\n" . $tr->GetSequence . "\n" . $tr->GetLength);
+ $self->SetPrev($tr->GetName . "\n" . $al->GetId . "\n" . $al->IsNonAlbumTracks . "\n" . $tr->sequence . "\n" . $tr->length);
$self->table("track");
$self->SetColumn("name");
$self->row_id($tr->GetId);
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Release.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -781,8 +781,8 @@
$track->SetId($row[0]);
$track->SetName($row[1]);
$track->artist($row[2]);
- $track->SetSequence($row[3]);
- $track->SetLength($row[4]);
+ $track->sequence($row[3]);
+ $track->length($row[4]);
$track->SetModPending($row[5]);
$track->SetAlbumJoinModPending($row[6]);
$track->artist_name($row[7]);
@@ -959,7 +959,7 @@
# Create a hash that contains the original album
foreach $tr (@tracks)
{
- $merged{$tr->GetSequence()} = $tr;
+ $merged{$tr->sequence()} = $tr;
}
$sql = Sql->new($this->{DBH});
@@ -993,12 +993,12 @@
@tracks = $al->LoadTracks();
foreach $tr (@tracks)
{
- if (exists $merged{$tr->GetSequence()})
+ if (exists $merged{$tr->sequence()})
{
# We already have that track. Move any existing TRMs/PUIDs
# to the existing track
my $old = $tr->GetId;
- my $new = $merged{$tr->GetSequence()}->GetId;
+ my $new = $merged{$tr->sequence()}->GetId;
require MusicBrainz::Server::TRM;
my $trm = MusicBrainz::Server::TRM->new($this->{DBH});
@@ -1024,7 +1024,7 @@
$this->GetId,
$tr->GetId,
);
- $merged{$tr->GetSequence()} = $tr;
+ $merged{$tr->sequence()} = $tr;
}
if (!$intoMAC)
@@ -1522,7 +1522,7 @@
for (@$tracks)
{
- ++$h{$_->GetSequence};
+ ++$h{$_->sequence};
}
\%h;
Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm 2008-09-01 23:54:41 UTC (rev 10292)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Track.pm 2008-09-01 23:55:51 UTC (rev 10293)
@@ -75,34 +75,28 @@
return $self->{album};
}
-sub GetSequence
+sub sequence
{
- return $_[0]->{sequence};
-}
+ my ($self, $new_sequence) = @_;
-sub SetSequence
-{
- $_[0]->{sequence} = $_[1];
+ if (defined $new_sequence) { $self->{sequence} = $new_sequence; }
+ return $self->{sequence};
}
-sub GetSequenceId
+sub sequence_id
{
- return $_[0]->{sequenceid};
-}
+ my ($self, $new_sequence) = @_;
-sub SetSequenceId
-{
- $_[0]->{sequenceid} = $_[1];
+ if (defined $new_sequence) { $self->{sequenceid} = $new_sequence; }
+ return $self->{sequenceid};
}
-sub GetLength
+sub length
{
- return $_[0]->{length};
-}
+ my ($self, $new_length) = @_;
-sub SetLength
-{
- $_[0]->{length} = $_[1];
+ if (defined $new_length) { $self->{length} = $new_length; }
+ return $self->{length};
}
sub GetModPending
@@ -353,7 +347,7 @@
AND track.id = albumjoin.track
AND LOWER(track.name) = LOWER(?)",
$album,
- $this->GetSequence,
+ $this->sequence,
$this->GetName,
);
return $track if $track;
@@ -365,7 +359,7 @@
modpending => 0,
);
- if (my $l = $this->GetLength)
+ if (my $l = $this->length)
{
$row{'length'} = $l;
}
@@ -446,7 +440,7 @@
$sql->Do(
"UPDATE track SET length = ? WHERE id = ?",
- $self->GetLength,
+ $self->length,
$self->GetId,
);
}
@@ -458,8 +452,8 @@
$sql->Do(
"UPDATE albumjoin SET sequence = ? WHERE id = ?",
- $self->GetSequence,
- $self->GetSequenceId,
+ $self->sequence,
+ $self->sequence_id,
);
}
More information about the MusicBrainz-commits
mailing list