Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preserve frame order #30

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve frame order #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 26 additions & 32 deletions v2/id3v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const (
// Tag represents an ID3v2 tag
type Tag struct {
*Header
frames map[string][]Framer
frames []Framer
padding uint
commonMap map[string]FrameType
frameHeaderSize int
Expand All @@ -32,7 +32,7 @@ func NewTag(version byte) *Tag {

t := &Tag{
Header: header,
frames: make(map[string][]Framer),
frames: make([]Framer, 0, 5),
dirty: false,
}

Expand Down Expand Up @@ -77,8 +77,7 @@ func ParseTag(readSeeker io.ReadSeeker) *Tag {
break
}

id := frame.Id()
t.frames[id] = append(t.frames[id], frame)
t.frames = append(t.frames, frame)
frame.setOwner(t)

size -= t.frameHeaderSize + int(frame.Size())
Expand Down Expand Up @@ -118,13 +117,11 @@ func (t Tag) Bytes() []byte {
data := make([]byte, t.Size())

index := 0
for _, v := range t.frames {
for _, f := range v {
size := t.frameHeaderSize + int(f.Size())
copy(data[index:index+size], t.frameBytesConstructor(f))
for _, f := range t.frames {
size := t.frameHeaderSize + int(f.Size())
copy(data[index:index+size], t.frameBytesConstructor(f))

index += size
}
index += size
}

return append(t.Header.Bytes(), data...)
Expand All @@ -141,29 +138,22 @@ func (t Tag) AllFrames() []Framer {
m := len(t.frames)
frames := make([]Framer, m)

i := 0
for _, frameSlice := range t.frames {
if i >= m {
frames = append(frames, frameSlice...)
}

n := copy(frames[i:], frameSlice)
i += n
if n < len(frameSlice) {
frames = append(frames, frameSlice[n:]...)
}
}
copy(frames, t.frames)

return frames
}

// All frames with specified ID
func (t Tag) Frames(id string) []Framer {
if frames, ok := t.frames[id]; ok && frames != nil {
return frames
rv := make([]Framer, 0, 1)

for _, f := range t.frames {
if f.Id() == id {
rv = append(rv, f)
}
}

return []Framer{}
return rv
}

// First frame with specified ID
Expand All @@ -183,14 +173,19 @@ func (t *Tag) DeleteFrames(id string) []Framer {
}

diff := 0
for _, frame := range frames {
frame.setOwner(nil)
diff += t.frameHeaderSize + int(frame.Size())
i := 0
for i < len(t.frames) {
frame := t.frames[i]
if frame.Id() != id {
i++
} else {
frame.setOwner(nil)
diff += t.frameHeaderSize + int(frame.Size())
t.frames = append(t.frames[:i], t.frames[i+1:]...)
}
}
t.changeSize(-diff)

delete(t.frames, id)

return frames
}

Expand All @@ -199,8 +194,7 @@ func (t *Tag) AddFrames(frames ...Framer) {
for _, frame := range frames {
t.changeSize(t.frameHeaderSize + int(frame.Size()))

id := frame.Id()
t.frames[id] = append(t.frames[id], frame)
t.frames = append(t.frames, frame)
frame.setOwner(t)
}
}
Expand Down