release: 1.7.5

Reviewed-on: #1

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018-present TaurusXin and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,26 +2,77 @@
 
 基于 https://github.com/taurusxin/ncmdump 的 Golang 移植版
 
-支持网易云音乐最新的 3.x 版本
+支持网易云音乐最新的 3.x 版本，但需要注意：从 3. x开始的某些网易云音乐版本不再在 ncm 文件中内置封面图片，本项目支持从网易服务器上自动下载对应歌曲的封面图并写入到最终的音乐文件中
+
+你也可以去 https://git.taurusxin.com/taurusxin/ncmdump-gui 下载基于本项目的 gui 可视化图形应用，只需简单点击即可自动转换。
+
+## 如何提 Issue
+
+由于本站恶意机器人注册过多，已关闭账号注册，如果需要提 Issue 请前往 [GitHub](https://github.com/taurusxin/ncmdump)，必须注明 Issue 的主题为 ncmdump-go，敬请谅解。
+
+## 安装
+
+你可以使用去 [releases](https://git.taurusxin.com/taurusxin/ncmdump-go/releases/latest) 下载最新版预编译好的二进制文件，或者你也可以用包管理器来安装
+
+```shell
+# Windows Scoop
+scoop bucket add taurusxin https://git.taurusxin.com/taurusxin/scoop-bucket.git  # 添加 scoop 源
+scoop install ncmdump-go # 安装 ncmdump-go
+
+# macOS & Linux 之后会支持
+```
 
 ## 使用方法
 
-```shell
-# 处理单个或多个文件
-ncmdump test1.ncm test2.ncm...
+使用 `-h` 或 `--help` 参数来打印帮助
 
-# 处理 Music 文件夹下的所有文件
-ncmdump -d Music
+```shell
+ncmdump-go -h
 ```
 
-注意：网易云音乐从 3.0 版本开始不再在 ncm 文件中嵌入封面图片，本工具支持从网易服务器上自动下载对应歌曲的封面图并写入到最终的音乐文件中
+使用 `-v` 或 `--version` 参数来打印版本信息
+
+```shell
+ncmdump-go -v
+```
+
+处理单个或多个文件
+
+```shell
+ncmdump-go 1.ncm 2.ncm...
+```
+
+使用 `-d` 参数来指定一个文件夹，对文件夹下的所有以 ncm 为扩展名的文件进行批量处理
+
+```shell
+ncmdump-go -d source_dir
+```
+
+使用 `-r` 配合 `-d` 参数来递归处理文件夹下的所有以 ncm 为扩展名的文件
+
+```shell
+ncmdump-go -d source_dir -r
+```
+
+使用 `-o` 参数来指定输出目录，将转换后的文件输出到指定目录，该参数支持与 `-r` 参数一起使用
+
+```shell
+# 处理单个或多个文件并输出到指定目录
+ncmdump-go 1.ncm 2.ncm -o output_dir
+
+# 处理文件夹下的所有以 ncm 为扩展名并输出到指定目录，不包含子文件夹
+ncmdump-go -d source_dir -o output_dir
+
+# 递归处理文件夹并输出到指定目录，并保留目录结构
+ncmdump-go -d source_dir -o output_dir -r
+```
 
 ## 开发
 
 使用 go module 下载 ncmdump-go 包
 
 ```shell
-go get -u github.com/taurusxin/ncmdump-go
+go get -u git.taurusxin.com/taurusxin/ncmdump-go
 ```
 
 导入并使用
@@ -31,7 +82,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/taurusxin/ncmdump-go/ncmcrypt"
+	"git.taurusxin.com/taurusxin/ncmdump-go/ncmcrypt"
 )
 
 func main() {

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION=1.6.0
+VERSION=1.7.5
 
 # Clean up the build directory
 rm -rf build
@@ -8,30 +8,30 @@ mkdir build
 
 # Linux amd64
 echo "Building for Linux amd64..."
-CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o build/ncmdump github.com/taurusxin/ncmdump-go
-tar zcf build/ncmdump_linux_amd64_$VERSION.tar.gz -C build ncmdump
-rm build/ncmdump
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o build/ncmdump-go git.taurusxin.com/taurusxin/ncmdump-go
+tar zcf build/ncmdump-go_linux_amd64_$VERSION.tar.gz -C build ncmdump-go
+rm build/ncmdump-go
 
 # Linux arm64
 echo "Building for Linux arm64..."
-CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-w -s" -o build/ncmdump github.com/taurusxin/ncmdump-go
-tar zcf build/ncmdump_linux_arm64_$VERSION.tar.gz -C build ncmdump
-rm build/ncmdump
+CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-w -s" -o build/ncmdump-go git.taurusxin.com/taurusxin/ncmdump-go
+tar zcf build/ncmdump-go_linux_arm64_$VERSION.tar.gz -C build ncmdump-go
+rm build/ncmdump-go
 
 # macOS amd64
 echo "Building for macOS amd64..."
-CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="-w -s" -o build/ncmdump github.com/taurusxin/ncmdump-go
-tar zcf build/ncmdump_darwin_amd64_$VERSION.tar.gz -C build ncmdump
-rm build/ncmdump
+CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="-w -s" -o build/ncmdump-go git.taurusxin.com/taurusxin/ncmdump-go
+tar zcf build/ncmdump-go_darwin_amd64_$VERSION.tar.gz -C build ncmdump-go
+rm build/ncmdump-go
 
 # macOS arm64
 echo "Building for macOS arm64..."
-CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="-w -s" -o build/ncmdump github.com/taurusxin/ncmdump-go
-tar zcf build/ncmdump_darwin_arm64_$VERSION.tar.gz -C build ncmdump
-rm build/ncmdump
+CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="-w -s" -o build/ncmdump-go git.taurusxin.com/taurusxin/ncmdump-go
+tar zcf build/ncmdump-go_darwin_arm64_$VERSION.tar.gz -C build ncmdump-go
+rm build/ncmdump-go
 
 # Windows amd64
 echo "Building for Windows amd64..."
-CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-w -s" -o build/ncmdump.exe github.com/taurusxin/ncmdump-go
-zip -q -j build/ncmdump_windows_amd64_$VERSION.zip ./build/ncmdump.exe
-rm build/ncmdump.exe
+CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-w -s" -o build/ncmdump-go.exe git.taurusxin.com/taurusxin/ncmdump-go
+zip -q -j build/ncmdump-go_windows_amd64_$VERSION.zip ./build/ncmdump-go.exe
+rm build/ncmdump-go.exe

go.mod

@@ -1,18 +1,19 @@
-module github.com/taurusxin/ncmdump-go
+module git.taurusxin.com/taurusxin/ncmdump-go
 
 go 1.23.0
 
 require github.com/tidwall/gjson v1.17.3
 
-require github.com/go-flac/go-flac v1.0.0
-
 require github.com/spf13/pflag v1.0.5
 
 require github.com/bogem/id3v2/v2 v2.1.4
 
-require github.com/go-flac/flacpicture v0.3.0
-
-require github.com/TwiN/go-color v1.4.1
+require (
+	github.com/TwiN/go-color v1.4.1
+	github.com/go-flac/flacpicture v0.3.0
+	github.com/go-flac/flacvorbis v0.2.0
+	github.com/go-flac/go-flac v1.0.0
+)
 
 require (
 	github.com/tidwall/match v1.1.1 // indirect

go.sum

@@ -4,6 +4,8 @@ github.com/bogem/id3v2/v2 v2.1.4 h1:CEwe+lS2p6dd9UZRlPc1zbFNIha2mb2qzT1cCEoNWoI=
 github.com/bogem/id3v2/v2 v2.1.4/go.mod h1:l+gR8MZ6rc9ryPTPkX77smS5Me/36gxkMgDayZ9G1vY=
 github.com/go-flac/flacpicture v0.3.0 h1:LkmTxzFLIynwfhHiZsX0s8xcr3/u33MzvV89u+zOT8I=
 github.com/go-flac/flacpicture v0.3.0/go.mod h1:DPbrzVYQ3fJcvSgLFp9HXIrEQEdfdk/+m0nQCzwodZI=
+github.com/go-flac/flacvorbis v0.2.0 h1:KH0xjpkNTXFER4cszH4zeJxYcrHbUobz/RticWGOESs=
+github.com/go-flac/flacvorbis v0.2.0/go.mod h1:uIysHOtuU7OLGoCRG92bvnkg7QEqHx19qKRV6K1pBrI=
 github.com/go-flac/go-flac v1.0.0 h1:6qI9XOVLcO50xpzm3nXvO31BgDgHhnr/p/rER/K/doY=
 github.com/go-flac/go-flac v1.0.0/go.mod h1:WnZhcpmq4u1UdZMNn9LYSoASpWOCMOoxXxcWEHSzkW8=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=

main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/taurusxin/ncmdump-go/ncmcrypt"
-	"github.com/taurusxin/ncmdump-go/utils"
+	"git.taurusxin.com/taurusxin/ncmdump-go/ncmcrypt"
+	"git.taurusxin.com/taurusxin/ncmdump-go/utils"
 	"os"
 	"path/filepath"
 
@@ -59,7 +59,7 @@ func main() {
 	}
 
 	if *showVersion {
-		fmt.Println("ncmdump version 1.6.0")
+		fmt.Println("ncmdump version 1.7.5")
 		os.Exit(0)
 	}
 

ncmcrypt/metadata.go

@@ -34,7 +34,7 @@ func NewNeteaseCloudMusicMetadata(meta string) *NeteaseClousMusicMetadata {
 	if len(artists) > 0 {
 		for i, artist := range artists {
 			if i > 0 {
-				metaData.mArtist += "/"
+				metaData.mArtist += " / "
 			}
 			metaData.mArtist += artist.Array()[0].String()
 		}

ncmcrypt/ncmcrypt.go

@@ -5,14 +5,16 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"fmt"
-	"github.com/bogem/id3v2/v2"
-	"github.com/go-flac/flacpicture"
-	"github.com/go-flac/go-flac"
-	"github.com/taurusxin/ncmdump-go/utils"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"git.taurusxin.com/taurusxin/ncmdump-go/utils"
+	"github.com/bogem/id3v2/v2"
+	"github.com/go-flac/flacpicture"
+	"github.com/go-flac/flacvorbis"
+	"github.com/go-flac/go-flac"
 )
 
 type NcmFormat = string
@@ -151,7 +153,7 @@ func (ncm *NeteaseCloudMusic) Dump(targetDir string) (bool, error) {
 			outputStream = output
 		}
 
-		outputStream.Write(buffer)
+		outputStream.Write(buffer[:n])
 	}
 
 	outputStream.Close()
@@ -161,7 +163,8 @@ func (ncm *NeteaseCloudMusic) Dump(targetDir string) (bool, error) {
 // FixMetadata will fix the missing metadata for target music file, the source of the metadata comes from origin ncm file.
 // Since NeteaseCloudMusic version 3.0, the album cover image is no longer embedded in the ncm file. If the parameter is true, it means downloading the image from the NetEase server and embedding it into the target music file (network connection required)
 func (ncm *NeteaseCloudMusic) FixMetadata(fetchAlbumImageFromRemote bool) (bool, error) {
-	if fetchAlbumImageFromRemote {
+	// only fetch album image from remote when it's not embedded in the ncm file
+	if len(ncm.mImageData) <= 0 && fetchAlbumImageFromRemote {
 		// get the album pic from url
 		resp, err := http.Get(ncm.mAlbumPicUrl)
 		if err != nil {
@@ -177,12 +180,14 @@ func (ncm *NeteaseCloudMusic) FixMetadata(fetchAlbumImageFromRemote bool) (bool,
 			}
 		}
 	}
-	if ncm.mFormat == Mp3 {
+	switch ncm.mFormat {
+	case Mp3:
 		audioFile, err := id3v2.Open(ncm.mDumpFilePath, id3v2.Options{Parse: true})
 		if err != nil {
 			return false, err
 		}
 		defer audioFile.Close()
+		audioFile.SetDefaultEncoding(id3v2.EncodingUTF8)
 		audioFile.SetTitle(ncm.mMetadata.mName)
 		audioFile.SetArtist(ncm.mMetadata.mArtist)
 		audioFile.SetAlbum(ncm.mMetadata.mAlbum)
@@ -202,7 +207,7 @@ func (ncm *NeteaseCloudMusic) FixMetadata(fetchAlbumImageFromRemote bool) (bool,
 		if err != nil {
 			return false, err
 		}
-	} else if ncm.mFormat == Flac {
+	case Flac:
 		audioFile, err := flac.ParseFile(ncm.mDumpFilePath)
 		if err != nil {
 			return false, err
@@ -216,12 +221,43 @@ func (ncm *NeteaseCloudMusic) FixMetadata(fetchAlbumImageFromRemote bool) (bool,
 			pictureMeta := pic.Marshal()
 			audioFile.Meta = append(audioFile.Meta, &pictureMeta)
 		}
-		generalMeta := &flac.MetaDataBlock{
-			Type: flac.VorbisComment,
-			Data: []byte(fmt.Sprintf("title=%s\nartist=%s\nalbum=%s", ncm.mMetadata.mName, ncm.mMetadata.mArtist, ncm.mMetadata.mAlbum)),
+
+		var cmts *flacvorbis.MetaDataBlockVorbisComment
+		var cmtIdx int
+		for idx, meta := range audioFile.Meta {
+			if meta.Type == flac.VorbisComment {
+				cmts, err = flacvorbis.ParseFromMetaDataBlock(*meta)
+				cmtIdx = idx
+				if err != nil {
+					return false, err
 				}
-		audioFile.Meta = append(audioFile.Meta, generalMeta)
+			}
+		}
+		if cmts == nil && cmtIdx > 0 {
+			cmts = flacvorbis.New()
+		}
+
+		// flac 可能自带元数据 当且仅当没有该项时才向目标添加元数据
+		if res, _ := cmts.Get(flacvorbis.FIELD_TITLE); len(res) == 0 {
+			_ = cmts.Add(flacvorbis.FIELD_TITLE, ncm.mMetadata.mName)
+		}
+		if res, _ := cmts.Get(flacvorbis.FIELD_ARTIST); len(res) == 0 {
+			_ = cmts.Add(flacvorbis.FIELD_ARTIST, ncm.mMetadata.mArtist)
+		}
+		if res, _ := cmts.Get(flacvorbis.FIELD_ALBUM); len(res) == 0 {
+			_ = cmts.Add(flacvorbis.FIELD_ALBUM, ncm.mMetadata.mAlbum)
+		}
+
+		cmtsmeta := cmts.Marshal()
+
+		if cmtIdx > 0 {
+			audioFile.Meta[cmtIdx] = &cmtsmeta
+		} else {
+			audioFile.Meta = append(audioFile.Meta, &cmtsmeta)
+		}
+
 		err = audioFile.Save(ncm.mDumpFilePath)
+
 		if err != nil {
 			return false, err
 		}