.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +1,31 @@
 ---
-name: "[请按照此模板填写] 报告 Bug"
+name: Bug report
-about: "创建一个 Bug 报告，不按照模板的 Issue 会被直接关闭，不予回复。"
+about: Create a bug report to help us improve
-title: "[Bug] 总结你的 Bug 报告"
+title: "[Bug] Summarize the bug here"
 labels: bug
 assignees: taurusxin
+
 ---
 
-**Bug 描述**
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-清晰地描述一下 Bug 的大致问题，例如无法转换，或者其他问题。
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
-**复现方法**
+**Expected behavior**
+A clear and concise description of what you expected to happen.
 
-复现此 Bug 的方法
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
 
-1. 使用本项目处理文件 '...'
+**Desktop (please complete the following information):**
-2. 发生报错
+ - OS: [e.g. Windows 11]
 
-**屏幕截图**
 
-如果可以，屏幕截图可以更好地阐述你的问题。
+**Additional context**
-
+Add any other context about the problem here.
-**环境**
-
-- 操作系统: Windows / macOS / Linux
-- 网易云版本（重要）: [e.g. 3.0.1]
-- 所选择的音质: 极高、无损等
-
-**附加内容**
-
-如果遇到无法转换的问题，请将样本附加到这里，便于分析。

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature] Summarize new feature here"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/autobuild.yml

@@ -1,6 +1,6 @@
 name: CI
 env:
-  BUILD_TYPE: MinSizeRel
+  BUILD_TYPE: Release
   BUILD_PATH: build
 on:
   push:
@@ -35,7 +35,7 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: windows_amd64_build_msys2_exe
+        name: Windows amd64 Build - MinGW
         path: ${{ env.BUILD_PATH }}/ncmdump.exe
 
   build_on_windows_msvc:
@@ -53,19 +53,13 @@ jobs:
     - name: Build
       run: cmake --build ${{ env.BUILD_PATH }} -j 4 --config ${{ env.BUILD_TYPE }}
 
-    - name: Upload artifact executable
+    - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: windows_amd64_build_msvc_exe
+        name: Windows amd64 Build - MSVC
         path: ${{ env.BUILD_PATH }}/${{ env.BUILD_TYPE }}/ncmdump.exe
   
-    - name: Upload artifact DLL
+  build_on_linux:
-      uses: actions/upload-artifact@v4
-      with:
-        name: windows_amd64_build_msvc_dll
-        path: ${{ env.BUILD_PATH }}/${{ env.BUILD_TYPE }}/libncmdump.dll
-  
-  build_on_linux_amd64:
     runs-on: ubuntu-latest
 
     steps:
@@ -88,10 +82,10 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: linux_build_amd64
+        name: Linux amd64 Build
         path: ${{ env.BUILD_PATH }}/ncmdump
 
-  build_on_macos_amd64:
+  build_on_macos:
     runs-on: macos-latest
 
     steps:
@@ -105,7 +99,7 @@ jobs:
         brew install git cmake
 
     - name: Configure build
-      run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -B ${{ env.BUILD_PATH }} -DCMAKE_OSX_ARCHITECTURES=x86_64
+      run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -B ${{ env.BUILD_PATH }}
 
     - name: Build
       run: cmake --build ${{ env.BUILD_PATH }} -j 4
@@ -113,30 +107,5 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: macOS_build_amd64
+        name: macOS amd64 Build
-        path: ${{ env.BUILD_PATH }}/ncmdump
-
-  build_on_macos_arm64:
-    runs-on: macos-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Install dependencies
-      run: |
-        brew install git cmake
-
-    - name: Configure build
-      run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -B ${{ env.BUILD_PATH }} -DCMAKE_OSX_ARCHITECTURES=arm64
-
-    - name: Build
-      run: cmake --build ${{ env.BUILD_PATH }} -j 4
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: macOS_build_arm64
         path: ${{ env.BUILD_PATH }}/ncmdump

.gitignore

@@ -5,5 +5,3 @@ ncmdump
 .idea
 
 build
-
-cmake-build-*

CMakeLists.txt

@@ -14,73 +14,38 @@ if(MSVC)
   add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:utf-8>")
 endif()
 
-FILE(GLOB COMMON_HEADERS src/include/*.h)
+FILE(GLOB HEADERS ./src/include/*.h)
-FILE(GLOB COMMON_SOURCES src/ncmcrypt.cpp src/utils/*.cpp)
+FILE(GLOB COMMON_SOURCES ./src/*.cpp ./src/utils/*.cpp)
-FILE(GLOB EXECUTABLE_SOURCES src/main.cpp)
+FILE(GLOB WIN_SOURCES ./src/platform/win32_init.cpp)
-FILE(GLOB LIBRARY_HEADERS src/lib/libncmdump.h)
+
-FILE(GLOB LIBRARY_SOURCES src/lib/*.cpp)
-FILE(GLOB WIN_SOURCES src/platform/win32_init.cpp)
 
 if(WIN32)
-  add_executable(ncmdump_exec
+  set(SOURCES ${COMMON_SOURCES} ${WIN_SOURCES})
-    ${COMMON_HEADERS}
-    ${COMMON_SOURCES}
-    ${EXECUTABLE_SOURCES}
-    ${WIN_SOURCES}
-  )
-  add_library(ncmdump_lib SHARED
-    ${COMMON_HEADERS}
-    ${COMMON_SOURCES}
-    ${LIBRARY_HEADERS}
-    ${LIBRARY_SOURCES}
-    ${WIN_SOURCES}
-  )
-
-  set_target_properties(ncmdump_lib PROPERTIES OUTPUT_NAME "libncmdump")
-
-  target_include_directories(ncmdump_lib PRIVATE src/include)
-
-  target_link_libraries(ncmdump_lib tag)
-  target_include_directories(ncmdump_lib PRIVATE taglib)
-  target_include_directories(ncmdump_lib PRIVATE taglib/taglib)
-  target_include_directories(ncmdump_lib PRIVATE taglib/taglib/toolkit)
-  target_include_directories(ncmdump_lib PRIVATE taglib/taglib/mpeg/id3v2)
-
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    # static link when using MinGW
-    target_link_options(ncmdump_exec PRIVATE -static)
-    target_link_options(ncmdump_lib PRIVATE -static)
-  endif()
 else()
-  add_executable(ncmdump_exec
+  set(SOURCES ${COMMON_SOURCES})
-    ${COMMON_HEADERS}
-    ${COMMON_SOURCES}
-    ${EXECUTABLE_SOURCES}
-  )
 endif()
+add_executable(ncmdump
+  ${HEADERS}
+  ${SOURCES}
+)
 
-# all executable target
+target_include_directories(ncmdump PRIVATE src/include)
-set_target_properties(ncmdump_exec PROPERTIES OUTPUT_NAME "ncmdump")
-target_include_directories(ncmdump_exec PRIVATE src/include)
 
-target_link_libraries(ncmdump_exec tag)
+target_link_libraries(ncmdump tag)
-target_include_directories(ncmdump_exec PRIVATE taglib)
+target_include_directories(ncmdump PRIVATE taglib)
-target_include_directories(ncmdump_exec PRIVATE taglib/taglib)
+target_include_directories(ncmdump PRIVATE taglib/taglib)
-target_include_directories(ncmdump_exec PRIVATE taglib/taglib/toolkit)
+target_include_directories(ncmdump PRIVATE taglib/taglib/toolkit)
-target_include_directories(ncmdump_exec PRIVATE taglib/taglib/mpeg/id3v2)
+target_include_directories(ncmdump PRIVATE taglib/taglib/mpeg/id3v2)
+
+if(WIN32)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    target_link_options(ncmdump PRIVATE -static)
+  endif()
+endif()
 
 include(GNUInstallDirs)
-
+install(TARGETS ncmdump
-if(WIN32)
-  install(TARGETS ncmdump_exec ncmdump_lib
   BUNDLE DESTINATION .
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
-else()
-  install(TARGETS ncmdump_exec
-    BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  )
-endif()

README.md

@@ -6,9 +6,8 @@
 
 该版本为最早的 C++ 版本，也是作者开发的市面上第一个支持 ncm 转换的程序
 
-源码复刻自 anonymous5l/ncmdump，感谢前辈的付出！做了 Windows 下的移植，修复了一些编译问题
+源码复刻自 anonymous5l/ncmdump，感谢前辈的付出！
-
+做了 Windows 下的移植，修复了一些编译问题
-1.3.0 版本更新说明：因为之前有小伙伴反馈无法解密带有特殊字符的文件名，例如中文、日文、韩文或者是表情符号等，在1.3.0以及之后的版本彻底修复了这个问题，所有的 UTF-8 字符都可以正常解密。并且还自带了 dll 的构建，可以供其他应用程序（C#、Python、Java等）调用。
 
 ## 传送门
 
@@ -16,13 +15,7 @@
 
 ## 使用
 
-注意：自网易云音乐 3.0 版本开始，下载的 ncm 文件均不内置歌曲专辑的封面图片，需要从网络获取，介于在一个小工具中嵌入庞大网络库的非必要性，可以移步我的另一个仓库（<https://git.taurusxin.com/taurusxin/ncmdump-go>），下载完全使用 Golang 重写的新版本，支持从网络自动获取封面图并嵌入到目标音乐文件。
+你可以使用 Homebrew 来安装 ncmdump
-
-### 命令行工具
-
-**[不推荐]** 你可以使用 Homebrew 来安装 Linux 或者 macOS 下的 ncmdump
-
-注意：由于本项目依赖的库 taglib 的 2.0 版本尚未发布到 homebrew-core（主要是因为 taglib 2.0 导致其他 brew 包存在版本兼容问题），目前的 cmake 构建链无法在 macOS 上正常使用。根据 brew 的要求，如果依赖库已有官方的 brew 包，构建时必须使用官方仓库中的包，不能从 git 获取。而 taglib 2.0 版本开始才支持 cmake 构建。因此，ncmdump 在 homebrew 上只能发布到 `1.2.1` 版本。建议直接通过二进制方式安装，`1.3.0` 后版本修复了许多 bug，使用体验会更好。
 
 ```shell
 brew install ncmdump
@@ -36,49 +29,18 @@ brew install ncmdump
 ncmdump -h
 ```
 
-使用 `-v` 或 `--version` 参数来打印版本信息
+命令行下输入一个或多个文件
 
 ```shell
-ncmdump -v
+ncmdump file1 file2...
 ```
 
-处理单个或多个文件
+你可以使用 `-d` 参数来指定一个文件夹，对文件夹下的所有文件批量处理
 
 ```shell
-ncmdump 1.ncm 2.ncm...
+ncmdump -d folder
 ```
 
-使用 `-d` 参数来指定一个文件夹，对文件夹下的所有以 ncm 为扩展名的文件进行批量处理
-
-```shell
-ncmdump -d source_dir
-```
-
-使用 `-r` 配合 `-d` 参数来递归处理文件夹下的所有以 ncm 为扩展名的文件
-
-```shell
-ncmdump -d source_dir -r
-```
-
-使用 `-o` 参数来指定输出目录，将转换后的文件输出到指定目录，该参数支持与 `-r` 参数一起使用
-
-```shell
-# 处理单个或多个文件并输出到指定目录
-ncmdump 1.ncm 2.ncm -o output_dir
-
-# 处理文件夹下的所有以 ncm 为扩展名并输出到指定目录，不包含子文件夹
-ncmdump -d source_dir -o output_dir
-
-# 递归处理文件夹并输出到指定目录，并保留目录结构
-ncmdump -d source_dir -o output_dir -r
-```
-
-### 动态库
-
-或者，如果你想利用此项目进行二次开发，例如在你的 C#、Python、Java 等项目中调用，你可以使用 `libncmdump` 动态库，具体使用方法见仓库的 `example` 文件夹
-
-请注意！如果你在 Windows 下开发，传递到库构造函数的文件名编码**必须为 UTF-8 编码**，否则会抛出运行时错误。
-
 ## 编译项目
 
 克隆本仓库
@@ -105,10 +67,6 @@ cmake -G "Visual Studio 17 2022" -A x64 -B build
 
 # Linux / macOS
 cmake -DCMAKE_BUILD_TYPE=Release -B build
-
-# 如果需要在 macOS 下交叉编译，可以指定 `CMAKE_OSX_ARCHITECTURES` 变量来指明目标系统架构
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 -B build  # arm64
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 -B build  # Intel-based
 ```
 
 编译项目
@@ -120,9 +78,3 @@ cmake --build build -j 8 --config Release
 # Windows MinGW / Linux / macOS
 cmake --build build -j 8
 ```
-
-你可以在 `build` 文件夹下找到编译好的二进制文件，以及一个可供其它项目使用的动态库(Windows Only)，使用方法见仓库的 `example` 文件夹
-
-## Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=taurusxin/ncmdump&type=Date)](https://star-history.com/#taurusxin/ncmdump&Date)

example/csharp/NeteaseCrypt.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace libncmdump_demo_cli
-{
-    /// <summary>
-    /// NeteaseCrypt C# Wrapper
-    /// </summary>
-    class NeteaseCrypt
-    {
-        const string DLL_PATH = "libncmdump.dll";
-
-        [DllImport(DLL_PATH, CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr CreateNeteaseCrypt(IntPtr path);
-
-        [DllImport(DLL_PATH, CallingConvention = CallingConvention.Cdecl)]
-        private static extern int Dump(IntPtr NeteaseCrypt, IntPtr outputPath);
-
-        [DllImport(DLL_PATH, CallingConvention = CallingConvention.Cdecl)]
-        private static extern void FixMetadata(IntPtr NeteaseCrypt);
-
-        [DllImport(DLL_PATH, CallingConvention = CallingConvention.Cdecl)]
-        private static extern void DestroyNeteaseCrypt(IntPtr NeteaseCrypt);
-
-        private IntPtr NeteaseCryptClass = IntPtr.Zero;
-
-        /// <summary>
-        /// 创建 NeteaseCrypt 类的实例。
-        /// </summary>
-        /// <param name="FileName">网易云音乐 ncm 加密文件路径</param>
-        public NeteaseCrypt(string FileName)
-        {
-            byte[] bytes = Encoding.UTF8.GetBytes(FileName);
-
-            IntPtr inputPtr = Marshal.AllocHGlobal(bytes.Length + 1);
-            Marshal.Copy(bytes, 0, inputPtr, bytes.Length);
-            Marshal.WriteByte(inputPtr, bytes.Length, 0);
-
-            NeteaseCryptClass = CreateNeteaseCrypt(inputPtr);
-        }
-
-        /// <summary>
-        /// 启动转换过程。
-        /// </summary>
-        /// <param name="OutputPath">指定一个路径输出，如果为空，则输出到原路径</param>
-        /// <returns>返回一个整数，指示转储过程的结果。如果成功，返回0；如果失败，返回1。</returns>
-        public int Dump(string OutputPath)
-        {
-            byte[] bytes = Encoding.UTF8.GetBytes(OutputPath);
-
-            IntPtr outputPtr = Marshal.AllocHGlobal(bytes.Length + 1);
-            Marshal.Copy(bytes, 0, outputPtr, bytes.Length);
-            Marshal.WriteByte(outputPtr, bytes.Length, 0);
-
-            return Dump(NeteaseCryptClass, outputPtr);
-        }
-
-        /// <summary>
-        /// 修复音乐文件元数据。
-        /// </summary>
-        public void FixMetadata()
-        {
-            FixMetadata(NeteaseCryptClass);
-        }
-
-        /// <summary>
-        /// 销毁 NeteaseCrypt 类的实例。
-        /// </summary>
-        public void Destroy()
-        {
-            DestroyNeteaseCrypt(NeteaseCryptClass);
-        }
-    }
-}

example/csharp/Program.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace libncmdump_demo_cli
-{
-    internal class Program
-    {
-        static void Main(string[] args)
-        {
-            // 文件名
-            string filePath = "test.ncm";
-
-            // 创建 NeteaseCrypt 类的实例
-            NeteaseCrypt neteaseCrypt = new NeteaseCrypt(filePath);
-
-            // 启动转换过程
-            int result = neteaseCrypt.Dump("");  // 为空则输出到源
-
-            // 修复元数据
-            neteaseCrypt.FixMetadata();
-
-            // [务必]销毁 NeteaseCrypt 类的实例
-            neteaseCrypt.Destroy();
-        }
-    }
-}

src/include/ncmcrypt.h

@@ -47,7 +47,7 @@ private:
 	NcmFormat mFormat;
 	std::string mImageData;
 	std::ifstream mFile;
-	unsigned char mKeyBox[256]{};
+	unsigned char mKeyBox[256];
 	NeteaseMusicMetadata* mMetaData;
 
 private:
@@ -66,6 +66,6 @@ public:
 	~NeteaseCrypt();
 
 public:
-	void Dump(std::string const&);
+	void Dump();
 	void FixMetadata();
 };

src/include/version.h

@@ -1,3 +0,0 @@
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 5
-#define VERSION_PATCH 0

src/lib/libncmdump.cpp

@@ -1,31 +0,0 @@
-#include "libncmdump.h"
-#include <filesystem>
-
-namespace fs = std::filesystem;
-
-extern "C" {
-    API NeteaseCrypt* CreateNeteaseCrypt(const char* path) {
-        fs::path fPath = fs::u8path(path);
-        return new NeteaseCrypt(fPath.u8string());
-    }
-
-    API int Dump(NeteaseCrypt* neteaseCrypt, const char* outputPath) {
-        try
-        {
-            neteaseCrypt->Dump(outputPath);
-        }
-        catch (const std::invalid_argument& e)
-        {
-            return 1;
-        }
-        return 0;
-    }
-
-    API void FixMetadata(NeteaseCrypt* neteaseCrypt) {
-        neteaseCrypt->FixMetadata();
-    }
-
-    API void DestroyNeteaseCrypt(NeteaseCrypt* neteaseCrypt) {
-        delete neteaseCrypt;
-    }
-}

src/lib/libncmdump.h

@@ -1,14 +0,0 @@
-#include "ncmcrypt.h"
-
-#ifdef _WIN32
-#define API __declspec(dllexport)
-#else
-#define API
-#endif
-
-extern "C" {
-    API NeteaseCrypt* CreateNeteaseCrypt(const char* path);
-    API int Dump(NeteaseCrypt* neteaseCrypt, const char* outputPath);
-    API void FixMetadata(NeteaseCrypt* neteaseCrypt);
-    API void DestroyNeteaseCrypt(NeteaseCrypt* neteaseCrypt);
-}

src/main.cpp

@@ -10,207 +10,115 @@
 #endif
 
 #include "color.h"
-#include "version.h"
-#include "cxxopts.hpp"
 
 namespace fs = std::filesystem;
 
-void processFile(const fs::path &filePath, const fs::path &outputFolder)
+void displayHelp()
+{
+    std::cout << "Usage: ncmdump [-d] [-h] file1 file2 ..." << std::endl;
+    std::cout << "Options:" << std::endl;
+    std::cout << "  -d               Process files in a folder (requires folder path)" << std::endl;
+    std::cout << "  -h, --help       Display this help message" << std::endl;
+}
+
+void processFile(const fs::path &filePath)
 {
     if (fs::exists(filePath) == false)
     {
-        std::cerr << BOLDRED << "[Error] " << RESET << "file '" << filePath.u8string() << "' does not exist." << std::endl;
+        std::cerr << BOLDRED << "Error: " << RESET << "file '" << filePath.u8string() << "' does not exist." << std::endl;
-        return;
-    }
-
-    // skip if not ending with ".ncm"
-    if (!filePath.has_extension() || filePath.extension().u8string() != ".ncm")
-    {
         return;
     }
 
     try
     {
         NeteaseCrypt crypt(filePath.u8string());
-        crypt.Dump(outputFolder.u8string());
+        crypt.Dump();
         crypt.FixMetadata();
 
-        std::cout << BOLDGREEN << "[Done] " << RESET << "'" << filePath.u8string() << "' -> '" << crypt.dumpFilepath().u8string() << "'" << std::endl;
+        std::cout << BOLDGREEN << "Done: " << RESET << "'" << crypt.dumpFilepath().u8string() << "'" << std::endl;
     }
     catch (const std::invalid_argument &e)
     {
-        std::cerr << BOLDRED << "[Exception] " << RESET << RED << e.what() << RESET << " '" << filePath.u8string() << "'" << std::endl;
+        std::cerr << BOLDRED << "Exception: " << RESET << RED << e.what() << RESET << " '" << filePath.u8string() << "'" << std::endl;
     }
     catch (...)
     {
-        std::cerr << BOLDRED << "[Error] Unexpected exception while processing file: " << RESET << filePath.u8string() << std::endl;
+        std::cerr << BOLDRED << "Unexpected exception while processing file: " << RESET << filePath.u8string() << std::endl;
+    }
+}
+
+void processFilesInFolder(const fs::path &folderPath)
+{
+    for (const auto &entry : fs::directory_iterator(folderPath))
+    {
+        if (fs::is_regular_file(entry.status()))
+        {
+            processFile(entry.path());
+        }
     }
 }
 
 int main(int argc, char **argv)
 {
 #if defined(_WIN32)
-    win32_utf8argv(&argc, &argv); // Convert command line arguments to UTF-8 under Windows
+    win32_utf8argv(&argc, &argv);
 #endif
-
+    if (argc <= 1)
-    cxxopts::Options options("ncmdump");
+    {
-
+        displayHelp();
-    options.add_options()
-    ("h,help", "Print usage")
-    ("d,directory", "Process files in a folder (requires folder path)", cxxopts::value<std::string>())
-    ("r,recursive", "Process files recursively (requires -d option)", cxxopts::value<bool>()->default_value("false"))
-    ("o,output", "Output folder (default: original file folder)", cxxopts::value<std::string>())
-    ("v,version", "Print version information", cxxopts::value<bool>()->default_value("false"))
-    ("filenames", "Input files", cxxopts::value<std::vector<std::string>>());
-
-    options.positional_help("<files>");
-
-    options.parse_positional({"filenames"});
-
-    options.allow_unrecognised_options();
-
-    // Parse options the usual way
-    cxxopts::ParseResult result;
-    try {
-        result = options.parse(argc, argv);
-    } catch(cxxopts::exceptions::parsing const& e) {
-        std::cout << options.help() << std::endl;
         return 1;
     }
 
-    // print usage message if unrecognised options are present
+    std::vector<fs::path> files;
-    if (result.unmatched().size() > 0)
+    bool processFolders = false;
-    {
-        std::cout << options.help() << std::endl;
-        return 1;
-    }
 
-    // display help message
+    bool folderProvided = false;
-    if (result.count("help"))
+
+#define COMPARE_STR(s1, s2) (strcmp(s1, s2) == 0)
+#define HELP_SHORT "-h"
+#define HELP_LONG "--help"
+#define PROCESS_FOLDER "-d"
+    for (int i = 1; i < argc; ++i)
     {
-        std::cout << options.help() << std::endl;
+        if (COMPARE_STR(argv[i], HELP_SHORT) || COMPARE_STR(argv[i], HELP_LONG))
+        {
+            displayHelp();
             return 0;
         }
-
+        else if (COMPARE_STR(argv[i], PROCESS_FOLDER))
-    // display version information
-    if (result.count("version"))
         {
-        std::cout << "ncmdump version " << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_PATCH << std::endl;
+            processFolders = true;
-        return 0;
+            if (i + 1 < argc && argv[i + 1][0] != '-')
+            {
+                folderProvided = true;
+                processFilesInFolder(argv[i + 1]);
+                // Skip the folder name
+                ++i;
             }
-
+            else
-    // no input files or folder provided
-    if (result.count("directory") == 0 && result.count("filenames") == 0)
             {
-        std::cout << options.help() << std::endl;
+                std::cerr << "Error: -d option requires a folder path." << std::endl;
                 return 1;
             }
-
-    // only -r option without -d option
-    if (result.count("recursive") && result.count("directory") == 0)
-    {
-        std::cerr << BOLDRED << "[Error] " << RESET << "-r option requires -d option." << std::endl;
-        return 1;
-    }
-
-    // check output folder
-    fs::path outputDir = fs::u8path("");
-    bool outputDirSpecified = result.count("output") > 0;
-
-    if (outputDirSpecified)
-    {
-        outputDir = fs::u8path(result["output"].as<std::string>());
-        if (fs::exists(outputDir))
-        {
-            if (!fs::is_directory(outputDir))
-            {
-                std::cerr << BOLDRED << "[Error] " << RESET << "'" << outputDir.u8string() << "' is not a valid directory." << std::endl;
-                return 1;
-            }
-        }
-        fs::create_directories(outputDir);
-    }
-
-    // process files in a folder
-    if (result.count("directory"))
-    {
-        fs::path sourceDir = fs::u8path(result["directory"].as<std::string>());
-        if (!fs::is_directory(sourceDir))
-        {
-            std::cerr << BOLDRED << "[Error] " << RESET << "'" << sourceDir.u8string() << "' is not a valid directory." << std::endl;
-            return 1;
-        }
-
-        bool recursive = result["recursive"].as<bool>();
-
-        if (recursive)
-        {
-            // 递归遍历源目录
-            for (const auto &entry : fs::recursive_directory_iterator(sourceDir))
-            {
-                // 没有指定输出目录，则使用源目录作为输出目录
-                if (!outputDirSpecified)
-                {
-                    outputDir = sourceDir;
-                }
-
-                // 获得递归遍历的相对路径
-                const auto &path = fs::u8path(entry.path().u8string());
-                auto relativePath = fs::relative(path, sourceDir);
-                fs::path destinationPath = outputDir / relativePath;
-
-                if (fs::is_regular_file(path))
-                {
-                    // 确保输出文件的目录存在
-                    fs::create_directories(destinationPath.parent_path());
-
-                    // 处理文件
-                    processFile(path, destinationPath.parent_path());
-                }
-            }
         }
         else
         {
-            for (const auto &entry : fs::directory_iterator(sourceDir))
+            fs::path path = fs::u8path(argv[i]);
+            files.push_back(path);
+        }
+    }
+
+    for (const auto &file : files)
     {
-                const auto &path = fs::u8path(entry.path().u8string());
+        if (processFolders && fs::is_directory(file))
-                if (entry.is_regular_file())
         {
-                    if (outputDirSpecified)
+            processFilesInFolder(file);
-                    {
-                        processFile(path, outputDir);
         }
         else
         {
-                        processFile(path, "");
+            processFile(file);
         }
     }
-            }
-        }
-        return 0;
-    }
 
-    // process individual files
-    if (result.count("filenames"))
-    {
-        for (const auto &filePath : result["filenames"].as<std::vector<std::string>>())
-        {
-            fs::path filePathU8 = fs::u8path(filePath);
-            if (!fs::is_regular_file(filePathU8))
-            {
-                std::cerr << BOLDRED << "[Error] " << RESET << "'" << filePathU8.u8string() << "' is not a valid file." << std::endl;
-                continue;
-            }
-
-            if (outputDirSpecified)
-            {
-                processFile(filePathU8, outputDir);
-            }
-            else
-            {
-                processFile(filePathU8, "");
-            }
-        }
-    }
     return 0;
 }

src/ncmcrypt.cpp

@@ -2,7 +2,6 @@
 #include "aes.h"
 #include "base64.h"
 #include "cJSON.h"
-#include "color.h"
 
 #define TAGLIB_STATIC
 #include "taglib/toolkit/tfile.h"
@@ -16,9 +15,6 @@
 #include <string>
 #include <filesystem>
 
-#pragma warning(disable:4267)
-#pragma warning(disable:4244)
-
 const unsigned char NeteaseCrypt::sCoreKey[17] = {0x68, 0x7A, 0x48, 0x52, 0x41, 0x6D, 0x73, 0x6F, 0x35, 0x6B, 0x49, 0x6E, 0x62, 0x61, 0x78, 0x57, 0};
 const unsigned char NeteaseCrypt::sModifyKey[17] = {0x23, 0x31, 0x34, 0x6C, 0x6A, 0x6B, 0x5F, 0x21, 0x5C, 0x5D, 0x26, 0x30, 0x55, 0x3C, 0x27, 0x28, 0};
 
@@ -224,7 +220,7 @@ void NeteaseCrypt::FixMetadata()
         audioFile = new TagLib::MPEG::File(mDumpFilepath.c_str());
         tag = dynamic_cast<TagLib::MPEG::File *>(audioFile)->ID3v2Tag(true);
 
-        if (!mImageData.empty())
+        if (mImageData.length() > 0)
         {
             TagLib::ID3v2::AttachedPictureFrame *frame = new TagLib::ID3v2::AttachedPictureFrame;
 
@@ -239,7 +235,7 @@ void NeteaseCrypt::FixMetadata()
         audioFile = new TagLib::FLAC::File(mDumpFilepath.c_str());
         tag = audioFile->tag();
 
-        if (!mImageData.empty())
+        if (mImageData.length() > 0)
         {
             TagLib::FLAC::Picture *cover = new TagLib::FLAC::Picture;
             cover->setMimeType(mimeType(mImageData));
@@ -257,20 +253,14 @@ void NeteaseCrypt::FixMetadata()
         tag->setAlbum(TagLib::String(mMetaData->album(), TagLib::String::UTF8));
     }
 
-    // tag->setComment(TagLib::String("Create by taurusxin/ncmdump.", TagLib::String::UTF8));
+    tag->setComment(TagLib::String("Create by netease copyright protected dump tool. author 5L", TagLib::String::UTF8));
 
     audioFile->save();
-    audioFile->~File();
 }
 
-void NeteaseCrypt::Dump(std::string const &outputDir = "")
+void NeteaseCrypt::Dump()
-{
-    if (outputDir.empty())
 {
     mDumpFilepath = std::filesystem::u8path(mFilepath);
-    } else {
-        mDumpFilepath = std::filesystem::u8path(outputDir) / std::filesystem::u8path(mFilepath).filename();
-    }
 
     std::vector<unsigned char> buffer(0x8000);
 
@@ -301,7 +291,7 @@ void NeteaseCrypt::Dump(std::string const &outputDir = "")
                 mFormat = NeteaseCrypt::FLAC;
             }
 
-            output.open(mDumpFilepath, std::ofstream::out | std::ofstream::binary);
+            output.open(mDumpFilepath, output.out | output.binary);
         }
 
         output.write((char *)buffer.data(), n);
@@ -367,7 +357,7 @@ NeteaseCrypt::NeteaseCrypt(std::string const &path)
 
     if (n <= 0)
     {
-        std::cout << BOLDYELLOW << "[Warn] " << RESET << "'" << path << "' missing metadata infomation can't fix some infomation!" << std::endl;
+        std::cout << "[Warn] " << path << " missing metadata infomation can't fix some infomation!" << std::endl;
 
         mMetaData = NULL;
     }
@@ -400,24 +390,23 @@ NeteaseCrypt::NeteaseCrypt(std::string const &path)
         mMetaData = new NeteaseMusicMetadata(cJSON_Parse(modifyDecryptData.c_str()));
     }
 
-    // skip crc32 & image version
+    // skip crc32 & unuse charset
-    if (!mFile.seekg(5, mFile.cur))
+    if (!mFile.seekg(9, mFile.cur))
     {
         throw std::invalid_argument("can't seek file");
     }
 
-    uint32_t cover_frame_len{0};
-    read(reinterpret_cast<char *>(&cover_frame_len), 4);
     read(reinterpret_cast<char *>(&n), sizeof(n));
 
     if (n > 0)
     {
-        mImageData = std::string(n, '\0');
+        char *imageData = (char *)malloc(n);
-        read(&mImageData[0], n);
+        read(imageData, n);
+
+        mImageData = std::string(imageData, n);
     }
     else
     {
-        std::cout << BOLDYELLOW << "[Warn] " << RESET << "'" << path << "' missing album can't fix album image!" << std::endl;
+        std::cout << "[Warn] " << path << " missing album can't fix album image!" << std::endl;
     }
-    mFile.seekg(cover_frame_len - n, mFile.cur);
 }

taglib

@@ -1 +1 @@
-Subproject commit e3de03501ff66221d1f1f971022b248d5b38ba06
+Subproject commit 0896fb90920c125e55248360d271d1a1674e2a4d