Unbewohnte
/
id3ed
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

⎣Re-did the structure, tried to implement frame reading, but looks like failed⎤

main
Unbewohnte 3 years ago
parent
d730be2ce4
commit
bc832479b8
13 changed files with 259 additions and 195 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      testData/testwritev1.mp3
  2. 97
      v1/v11read.go
  3. 15
      v1/v11tags.go
  4. 102
      v1/v11write.go
  5. 80
      v1/v1read.go
  6. 16
      v1/v1tags.go
  7. 86
      v1/v1write.go
  8. 2
      v2/constants.go
  9. 2
      v2/frame.go
  10. 4
      v2/frame_test.go
  11. 3
      v2/header.go
  12. 34
      v2/read.go
  13. 13
      v2/read_test.go

BIN
testData/testwritev1.mp3
View File

Binary file not shown.

97
v1/v11read.go
Unescape View File

@ -0,0 +1,97 @@
package v1
import (
"bytes"
"fmt"
"io"
"strconv"
"github.com/Unbewohnte/id3ed/util"
)
// Retrieves ID3v1.1 field values of provided io.ReadSeeker
func Getv11Tags(rs io.ReadSeeker) (*ID3v11Tags, error) {
// set reader to the last 128 bytes
_, err := rs.Seek(-int64(ID3v1SIZE), io.SeekEnd)
if err != nil {
return nil, fmt.Errorf("could not seek: %s", err)
}
tag, err := util.Read(rs, 3)
if err != nil {
return nil, err
}
if !bytes.Equal(tag, []byte(ID3v1IDENTIFIER)) {
// no TAG, given file does not use ID3v1
return nil, fmt.Errorf("does not use ID3v1: expected %s; got %s", ID3v1IDENTIFIER, tag)
}
songname, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
artist, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
album, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
yearStr, err := util.ReadToString(rs, 4)
if err != nil {
return nil, err
}
year, err := strconv.Atoi(yearStr)
if err != nil {
return nil, fmt.Errorf("could not convert yearbytes into int: %s", err)
}
comment, err := util.ReadToString(rs, 28)
if err != nil {
return nil, err
}
// skip 1 null byte
_, err = util.Read(rs, 1)
if err != nil {
return nil, err
}
trackByte, err := util.Read(rs, 1)
if err != nil {
return nil, err
}
track, err := util.BytesToInt(trackByte)
if err != nil {
return nil, fmt.Errorf("cannot convert bytes to int: %s", err)
}
genreByte, err := util.Read(rs, 1)
if err != nil {
return nil, err
}
genreInt, err := util.BytesToInt(genreByte)
if err != nil {
return nil, fmt.Errorf("cannot convert bytes to int: %s", err)
}
genre, exists := id3v1genres[int(genreInt)]
if !exists {
genre = ""
}
return &ID3v11Tags{
SongName: songname,
Artist: artist,
Album: album,
Year: year,
Comment: comment,
Track: int(track),
Genre: genre,
}, nil
}

15
v1/v11tags.go
Unescape View File

@ -0,0 +1,15 @@
package v1
type ID3v11Tags struct {
SongName string
Artist string
Album string
Year int
Comment string
Track int
Genre string
}
func (tags *ID3v11Tags) Version() int {
return 11
}

102
v1/id3v11.go → v1/v11write.go
Unescape View File

@ -6,108 +6,10 @@ import (
"fmt"
"io"
"os"
"strconv"
"github.com/Unbewohnte/id3ed/util"
)
type ID3v11Tags struct {
SongName string
Artist string
Album string
Year int
Comment string
Track int
Genre string
}
// Retrieves ID3v1.1 field values of provided io.ReadSeeker
func Getv11Tags(rs io.ReadSeeker) (*ID3v11Tags, error) {
// set reader to the last 128 bytes
_, err := rs.Seek(-int64(ID3v1SIZE), io.SeekEnd)
if err != nil {
return nil, fmt.Errorf("could not seek: %s", err)
}
tag, err := util.Read(rs, 3)
if err != nil {
return nil, err
}
if !bytes.Equal(tag, []byte(ID3v1IDENTIFIER)) {
// no TAG, given file does not use ID3v1
return nil, fmt.Errorf("does not use ID3v1: expected %s; got %s", ID3v1IDENTIFIER, tag)
}
songname, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
artist, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
album, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
yearStr, err := util.ReadToString(rs, 4)
if err != nil {
return nil, err
}
year, err := strconv.Atoi(yearStr)
if err != nil {
return nil, fmt.Errorf("could not convert yearbytes into int: %s", err)
}
comment, err := util.ReadToString(rs, 28)
if err != nil {
return nil, err
}
// skip 1 null byte
_, err = util.Read(rs, 1)
if err != nil {
return nil, err
}
trackByte, err := util.Read(rs, 1)
if err != nil {
return nil, err
}
track, err := util.BytesToInt(trackByte)
if err != nil {
return nil, fmt.Errorf("cannot convert bytes to int: %s", err)
}
genreByte, err := util.Read(rs, 1)
if err != nil {
return nil, err
}
genreInt, err := util.BytesToInt(genreByte)
if err != nil {
return nil, fmt.Errorf("cannot convert bytes to int: %s", err)
}
genre, exists := id3v1genres[int(genreInt)]
if !exists {
genre = ""
}
return &ID3v11Tags{
SongName: songname,
Artist: artist,
Album: album,
Year: year,
Comment: comment,
Track: int(track),
Genre: genre,
}, nil
}
// Writes given ID3v1.1 tags to dst
// NOTE: will not remove already existing ID3v1.1 tag if it`s present,
// use ⁕WriteToFile⁕ method if you`re working with REAL mp3 files !!!
@ -225,7 +127,3 @@ func (tags *ID3v11Tags) WriteToFile(f *os.File) error {
return nil
}
func (tags *ID3v11Tags) Version() int {
return 11
}

80
v1/v1read.go
Unescape View File

@ -0,0 +1,80 @@
package v1
import (
"bytes"
"fmt"
"io"
"strconv"
"github.com/Unbewohnte/id3ed/util"
)
// Retrieves ID3v1 field values of provided io.ReadSeeker (usually a file)
func Getv1Tags(rs io.ReadSeeker) (*ID3v1Tags, error) {
// set reader to the last 128 bytes
_, err := rs.Seek(-int64(ID3v1SIZE), io.SeekEnd)
if err != nil {
return nil, fmt.Errorf("could not seek: %s", err)
}
tag, err := util.Read(rs, 3)
if err != nil {
return nil, err
}
if !bytes.Equal(tag, []byte(ID3v1IDENTIFIER)) {
// no TAG, given file does not use ID3v1
return nil, fmt.Errorf("does not use ID3v1: expected %s; got %s", ID3v1IDENTIFIER, tag)
}
songname, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
artist, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
album, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
yearStr, err := util.ReadToString(rs, 4)
if err != nil {
return nil, err
}
year, err := strconv.Atoi(yearStr)
if err != nil {
return nil, fmt.Errorf("could not convert yearbytes into int: %s", err)
}
comment, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
genreByte, err := util.Read(rs, 1)
if err != nil {
return nil, err
}
genreInt, err := util.BytesToInt(genreByte)
if err != nil {
return nil, fmt.Errorf("cannot convert bytes to int: %s", err)
}
genre, exists := id3v1genres[int(genreInt)]
if !exists {
genre = ""
}
return &ID3v1Tags{
SongName: songname,
Artist: artist,
Album: album,
Year: year,
Comment: comment,
Genre: genre,
}, nil
}

16
v1/v1tags.go
Unescape View File

@ -0,0 +1,16 @@
package v1
// https://id3.org/ID3v1 - documentation
type ID3v1Tags struct {
SongName string
Artist string
Album string
Year int
Comment string
Genre string
}
func (tags *ID3v1Tags) Version() int {
return 10
}

86
v1/id3v10.go → v1/v1write.go
Unescape View File

@ -6,92 +6,10 @@ import (
"fmt"
"io"
"os"
"strconv"
"github.com/Unbewohnte/id3ed/util"
)
// https://id3.org/ID3v1 - documentation
type ID3v1Tags struct {
SongName string
Artist string
Album string
Year int
Comment string
Genre string
}
// Retrieves ID3v1 field values of provided io.ReadSeeker (usually a file)
func Getv1Tags(rs io.ReadSeeker) (*ID3v1Tags, error) {
// set reader to the last 128 bytes
_, err := rs.Seek(-int64(ID3v1SIZE), io.SeekEnd)
if err != nil {
return nil, fmt.Errorf("could not seek: %s", err)
}
tag, err := util.Read(rs, 3)
if err != nil {
return nil, err
}
if !bytes.Equal(tag, []byte(ID3v1IDENTIFIER)) {
// no TAG, given file does not use ID3v1
return nil, fmt.Errorf("does not use ID3v1: expected %s; got %s", ID3v1IDENTIFIER, tag)
}
songname, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
artist, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
album, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
yearStr, err := util.ReadToString(rs, 4)
if err != nil {
return nil, err
}
year, err := strconv.Atoi(yearStr)
if err != nil {
return nil, fmt.Errorf("could not convert yearbytes into int: %s", err)
}
comment, err := util.ReadToString(rs, 30)
if err != nil {
return nil, err
}
genreByte, err := util.Read(rs, 1)
if err != nil {
return nil, err
}
genreInt, err := util.BytesToInt(genreByte)
if err != nil {
return nil, fmt.Errorf("cannot convert bytes to int: %s", err)
}
genre, exists := id3v1genres[int(genreInt)]
if !exists {
genre = ""
}
return &ID3v1Tags{
SongName: songname,
Artist: artist,
Album: album,
Year: year,
Comment: comment,
Genre: genre,
}, nil
}
// Writes given ID3v1.0 tags to given io.WriteSeeker.
// NOTE: will not remove already existing ID3v1 tag if it`s present,
// use ⁕WriteToFile⁕ method if you`re working with REAL mp3 files !!!
@ -192,7 +110,3 @@ func (tags *ID3v1Tags) WriteToFile(f *os.File) error {
return nil
}
func (tags *ID3v1Tags) Version() int {
return 10
}

2
v2/constants.go
Unescape View File

@ -4,5 +4,3 @@ package v2
const HEADERIDENTIFIER string = "ID3"
const HEADERSIZE int = 10 // bytes
const HEADERMAXSIZE int = 268435456 // bytes (256 MB)
// Version specific constants

2
v2/frame.go
Unescape View File

@ -25,7 +25,7 @@ type Frame struct {
}
// Reads ID3v2.3.0 or ID3v2.4.0 frame
func ReadFrame(rs io.Reader, version uint) (*Frame, error) {
func ReadFrame(rs io.Reader) (*Frame, error) {
var frame Frame
// ID

4
v2/frame_test.go
Unescape View File

@ -18,7 +18,7 @@ func TestReadFrame(t *testing.T) {
// read right after header`s bytes
f.Seek(int64(HEADERSIZE), io.SeekStart)
firstFrame, err := ReadFrame(f, 24)
firstFrame, err := ReadFrame(f)
if err != nil {
t.Errorf("ReadFrame failed: %s", err)
}
@ -31,7 +31,7 @@ func TestReadFrame(t *testing.T) {
t.Errorf("ReadFrame failed: expected compressed flag to be %v; got %v", false, firstFrame.Flags.Encrypted)
}
secondFrame, err := ReadFrame(f, 24)
secondFrame, err := ReadFrame(f)
if err != nil {
t.Errorf("ReadFrame failed: %s", err)
}

3
v2/header.go
Unescape View File

@ -21,8 +21,7 @@ type Header struct {
Identifier string
Flags HeaderFlags
Version uint
Size int64 // size of the whole tag - 10 header bytes
Size int64 // size of the whole tag - 10 header bytes
}
// Reads and structuralises ID3v2.3.0 or ID3v2.4.0 header

34
v2/read.go
Unescape View File

@ -0,0 +1,34 @@
package v2
// Reads ID3v2 frames from rs. NOT TESTED !!!!
// func GetFrames(rs io.ReadSeeker) ([]*Frame, error) {
// header, err := GetHeader(rs)
// if err != nil {
// return nil, fmt.Errorf("could not get header: %s", err)
// }
// tagsize := header.Size
// var frames []*Frame
// var read uint64 = 0
// for {
// if read == uint64(tagsize) {
// break
// }
// frame, err := ReadFrame(rs)
// if err != nil {
// return frames, fmt.Errorf("could not read frame: %s", err)
// }
// frames = append(frames, frame)
// // counting how many bytes has been read
// read += 10 // frame header
// if frame.Flags.InGroup {
// // header has 1 additional byte
// read += 1
// }
// read += uint64(frame.Size) // and the contents itself
// }
// return frames, nil
// }

13
v2/read_test.go
Unescape View File

@ -0,0 +1,13 @@
package v2
// func TestGetFrames(t *testing.T) {
// f, err := os.Open(filepath.Join(TESTDATAPATH, "testreadv2.mp3"))
// if err != nil {
// t.Errorf("%s", err)
// }
// _, err = GetFrames(f)
// if err != nil {
// t.Errorf("GetFrames failed: %s", err)
// }
// }
Write Preview
Loading…
Cancel
Save