From 3808e901be6dcced780b60eaf432438f8d4a6cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:08:52 +0900 Subject: [PATCH] feat: add chattts download & del unnecessaries --- .gitignore | 3 + .goreleaser.yml | 2 +- Makefile | 33 ++++++++++ README.md | 105 ++++++++++++------------------- README_kr.md | 111 ++++++++++++--------------------- README_sc.md | 104 +++++++++++------------------- assets/chtts.yaml | 17 +++++ assets/hubert.yaml | 4 +- assets/rmvpe.yaml | 6 +- assets/{all.yaml => rvc.yaml} | 2 +- assets/uvr5.yaml | 2 +- assets/v1.yaml | 2 +- assets/v2.yaml | 2 +- main.go | 5 +- packs/amd/latest.yaml | 3 - packs/amd/v2/20230813.yaml | 7 --- packs/amd/v2/20231006.yaml | 7 --- packs/general/latest.yaml | 7 --- packs/general/v1/20230331.yaml | 7 --- packs/general/v1/20230416.yaml | 7 --- packs/general/v1/20230428.yaml | 7 --- packs/general/v1/20230508.yaml | 7 --- packs/general/v1/20230513.yaml | 7 --- packs/general/v1/20230516.yaml | 7 --- packs/general/v1/20230717.yaml | 7 --- packs/general/v2/20230528.yaml | 7 --- packs/general/v2/20230618.yaml | 7 --- packs/intel/latest.yaml | 3 - packs/intel/v2/20230813.yaml | 7 --- packs/intel/v2/20231006.yaml | 7 --- packs/nvidia/latest.yaml | 3 - packs/nvidia/v2/20230813.yaml | 7 --- packs/nvidia/v2/20231006.yaml | 7 --- tools/ffmpeg.yaml | 8 --- 34 files changed, 184 insertions(+), 343 deletions(-) create mode 100644 Makefile create mode 100644 assets/chtts.yaml rename assets/{all.yaml => rvc.yaml} (53%) delete mode 100644 packs/amd/latest.yaml delete mode 100644 packs/amd/v2/20230813.yaml delete mode 100644 packs/amd/v2/20231006.yaml delete mode 100644 packs/general/latest.yaml delete mode 100644 packs/general/v1/20230331.yaml delete mode 100644 packs/general/v1/20230416.yaml delete mode 100644 packs/general/v1/20230428.yaml delete mode 100644 packs/general/v1/20230508.yaml delete mode 100644 packs/general/v1/20230513.yaml delete mode 100644 packs/general/v1/20230516.yaml delete mode 100644 packs/general/v1/20230717.yaml delete mode 100644 packs/general/v2/20230528.yaml delete mode 100644 packs/general/v2/20230618.yaml delete mode 100644 packs/intel/latest.yaml delete mode 100644 packs/intel/v2/20230813.yaml delete mode 100644 packs/intel/v2/20231006.yaml delete mode 100644 packs/nvidia/latest.yaml delete mode 100644 packs/nvidia/v2/20230813.yaml delete mode 100644 packs/nvidia/v2/20231006.yaml delete mode 100644 tools/ffmpeg.yaml diff --git a/.gitignore b/.gitignore index b6a8c16..17203a1 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ go.work # MacOS system file .DS_Store + +# build result +/build diff --git a/.goreleaser.yml b/.goreleaser.yml index 6a4e5f7..535f49f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -81,7 +81,7 @@ archives: nfpms: - license: AGPL 3.0 - homepage: https://github.com/RVC-Project/RVC-Models-Downloader + homepage: https://github.com/fumiama/RVC-Models-Downloader file_name_template: "rvcmd_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" formats: - deb diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1b465e1 --- /dev/null +++ b/Makefile @@ -0,0 +1,33 @@ +PROJECT_NAME := rvcmd +BUILD_PATH := build +RUN_CMD := -h + +GOOS := $(go env GOOS) +GOARCH := $(go env GOARCH) +GO_SRC_WIN := $(shell find . -maxdepth 1 -name '*.go' | grep -v '_test.go$$' | grep -v '_windows.go$$') +GO_SRC_NO_WIN := $(shell echo $(GO_SRC_WIN) | grep -v '_windows.go$$') + +all: + @$(MAKE) -e bin +bin: gen dir tidy + @if [[ "$(GOARCH)" == "windows" ]]; then \ + GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags "-s -w" -trimpath -o $(BUILD_PATH)/$(PROJECT_NAME).exe; \ + else \ + GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags "-s -w" -trimpath -o $(BUILD_PATH)/$(PROJECT_NAME); \ + fi +run: bin + @if [[ "$(GOARCH)" == "windows" ]]; then \ + $(BUILD_PATH)/$(PROJECT_NAME).exe $(RUN_CMD); \ + else \ + $(BUILD_PATH)/$(PROJECT_NAME) $(RUN_CMD); \ + fi +gen: + @go generate +tidy: + @go mod tidy +dir: + @if [ ! -d "$(BUILD_PATH)" ]; then mkdir $(BUILD_PATH); fi +clean: + @if [ -d "$(BUILD_PATH)" ]; then \ + rm -rf $(BUILD_PATH)/$(PROJECT_NAME)*; \ + fi diff --git a/README.md b/README.md index 4d267cf..2276092 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ English | [简体中文](README_sc.md) | [한국어](README_kr.md) Easy tool to download a batch of files listed in yaml (ex. RVC models in Hugging Face 🤗). -![tui demo](https://github.com/RVC-Project/RVC-Models-Downloader/assets/41315874/db577dfb-8a6d-4909-b071-9d36cc77afc6) +![tui demo](https://github.com/fumiama/RVC-Models-Downloader/assets/41315874/db577dfb-8a6d-4909-b071-9d36cc77afc6) ## Quick Start ### Preparation -1. Download the program at [Release](https://github.com/RVC-Project/RVC-Models-Downloader/releases) page. +1. Download the program at [Release](https://github.com/fumiama/RVC-Models-Downloader/releases) page. 2. Put this program into the root directory of RVC (or whatever position you want to download some files into). 3. You can also add it to the `PATH` to use this tool everywhere. If you have installed this program by a package manager, it may be already in the `PATH`. @@ -19,70 +19,64 @@ Easy tool to download a batch of files listed in yaml (ex. RVC models in Hugging #### All Assets of RVC ```bash -rvcmd assets/all +rvcmd assets/rvc ``` -#### Latest General Pack of RVC (Windows Only) +#### All Assets of ChatTTS ```bash -rvcmd packs/general/latest -``` - -#### ffmpeg Tools (Windows Only) - -```bash -rvcmd tools/ffmpeg +rvcmd -w 1 assets/chtts ``` ### Customized Download -#### Ex.1. Download ffmpeg Tools & Latest Intel Pack +#### Ex.1. Download hubert & rmvpe 1. Write and save the following `cust.yaml`. - ```yaml - BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main - Targets: - - Refer: tools/ffmpeg - - Refer: packs/intel/latest - ``` + ```yaml + BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main + Targets: + - Refer: hubert + - Refer: rmvpe + ``` 2. Run `rvcmd` in the same folder. - ```bash - rvcmd -c cust - ``` + ```bash + rvcmd -c cust + ``` #### Ex.2. Download other Repositories in 🤗 > Use [Stable Diffusion v1-5](https://huggingface.co/runwayml/stable-diffusion-v1-5) as the example. 1. Write and save the following `cust.yaml`. - ```yaml - BaseURL: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main - Targets: - - Folder: sd1.5 # the folder you want to download into - Copy: # files to download - - v1-5-pruned-emaonly.ckpt - - v1-5-pruned-emaonly.safetensors - - Folder: sd1.5/vae # the folder you want to download into - Copy: # files to download - - vae/diffusion_pytorch_model.bin - ``` + ```yaml + BaseURL: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main + Targets: + - Folder: sd1.5 # the folder you want to download into + Copy: # files to download + - v1-5-pruned-emaonly.ckpt + - v1-5-pruned-emaonly.safetensors + - Folder: sd1.5/vae # the folder you want to download into + Copy: # files to download + - vae/diffusion_pytorch_model.bin + ``` #### Ex.3. Download Releases in GitHub > Use [yousa-ling-diffsinger-v1.3](https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/tag/v1.3) as the example. 1. Write and save the following `cust.yaml`. - ```yaml - BaseURL: https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/download/v1.3 - Targets: - - Folder: . # the folder you want to download into - Copy: # files to download - - yousaV1.3.zip - ``` + ```yaml + BaseURL: https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/download/v1.3 + Targets: + - Folder: . # the folder you want to download into + Copy: # files to download + - yousaV1.3.zip + ``` 2. Run `rvcmd` in the same folder. - ```bash - rvcmd -c cust - ``` + ```bash + rvcmd -c cust + ``` ## Full Usage @@ -97,37 +91,16 @@ Usage: rvcmd [-notrs] [-dns dns.yaml] 'target/to/download' -notui use plain text instead of TUI -ua string - customize user agent + customize user agent (default "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0") -w uint connection waiting seconds (default 4) 'target/to/download' like packs/general/latest All available targets: assets: - all hubert rmvpe uvr5 v1 v2 - packs: - amd: - latest - v2: - 20230813 20231006 - general: - latest - v1: - 20230331 20230416 20230428 20230508 20230513 20230516 20230717 - v2: - 20230528 20230618 - intel: - latest - v2: - 20230813 20231006 - nvidia: - latest - v2: - 20230813 20231006 - tools: - ffmpeg + chtts hubert rmvpe rvc uvr5 v1 v2 ``` ## Demo Video -https://github.com/RVC-Project/RVC-Models-Downloader/assets/41315874/da2b5827-8b1a-45f8-a9c0-03a5618ad5f8 +https://github.com/fumiama/RVC-Models-Downloader/assets/41315874/da2b5827-8b1a-45f8-a9c0-03a5618ad5f8 diff --git a/README_kr.md b/README_kr.md index bfc81f2..0236d3b 100644 --- a/README_kr.md +++ b/README_kr.md @@ -4,13 +4,13 @@ yaml의 batch 파일을 쉽게 다운로드 할 수 있는 도구입니다. (Hugging Face 🤗의 RVC 모델 등). -![tui demo](https://github.com/RVC-Project/RVC-Models-Downloader/assets/41315874/db577dfb-8a6d-4909-b071-9d36cc77afc6) +![tui demo](https://github.com/fumiama/RVC-Models-Downloader/assets/41315874/db577dfb-8a6d-4909-b071-9d36cc77afc6) ## 빠른 시작 ### 준비 -1. [릴리스](https://github.com/RVC-Project/RVC-Models-Downloader/releases) 페이지에서 프로그램을 다운로드를 받아주세요. +1. [릴리스](https://github.com/fumiama/RVC-Models-Downloader/releases) 페이지에서 프로그램을 다운로드를 받아주세요. 2. 해당 프로그램을 RVC의 루트 디렉토리(또는 파일을 다운로드하고 싶은 위치)에 넣어주세요. 3. 이 도구를 어디에서나 사용할 수 있도록 `PATH`에 추가할 수도 있습니다. 패키지 매니저를 통해 이 프로그램을 설치했다면 이미 `PATH`에 등록되어 있을 수 있습니다. @@ -19,72 +19,64 @@ yaml의 batch 파일을 쉽게 다운로드 할 수 있는 도구입니다. (Hug #### RVC의 모든 자산 ```bash -rvcmd assets/all +rvcmd assets/rvc ``` -#### RVC의 최신 일반 팩 (Windows 전용) +#### ChatTTS의 모든 자산 ```bash -rvcmd packs/general/latest -``` - -#### ffmpeg 도구 (Windows 전용) - -```bash -rvcmd tools/ffmpeg +rvcmd -w 1 assets/chtts ``` ### 사용자 정의 다운로드 -#### 예시 1. ffmpeg 도구 & 최신 인텔 팩 다운로드 +#### 예시 1. hubert & rmvpe 다운로드 1. 다음 내용을 포함한 `cust.yaml`을 작성하고 저장합니다. - ```yaml - BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main - Targets: - - Refer: tools/ffmpeg - - Refer: packs/intel/latest - ``` + ```yaml + BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main + Targets: + - Refer: hubert + - Refer: rmvpe + ``` 2. 같은 폴더에서 `rvcmd`를 실행합니다. + ```bash + rvcmd -c cust + ``` - ```bash - rvcmd -c cust - ``` - - #### 예시 2. 🤗의 다른 저장소 다운로드 +#### 예시 2. 🤗의 다른 저장소 다운로드 - > [Stable Diffusion v1-5](https://huggingface.co/runwayml/stable-diffusion-v1-5)를 예시로 사용합니다. +> [Stable Diffusion v1-5](https://huggingface.co/runwayml/stable-diffusion-v1-5)를 예시로 사용합니다. - 1. 다음 내용을 포함한 `cust.yaml`을 작성하고 저장합니다. - ```yaml - BaseURL: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main - Targets: - - Folder: sd1.5 # 다운로드할 폴더 - Copy: # 다운로드할 파일 - - v1-5-pruned-emaonly.ckpt - - v1-5-pruned-emaonly.safetensors - - Folder: sd1.5/vae # 다운로드할 폴더 - Copy: # 다운로드할 파일 - - vae/diffusion_pytorch_model.bin - ``` +1. 다음 내용을 포함한 `cust.yaml`을 작성하고 저장합니다. + ```yaml + BaseURL: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main + Targets: + - Folder: sd1.5 # 다운로드할 폴더 + Copy: # 다운로드할 파일 + - v1-5-pruned-emaonly.ckpt + - v1-5-pruned-emaonly.safetensors + - Folder: sd1.5/vae # 다운로드할 폴더 + Copy: # 다운로드할 파일 + - vae/diffusion_pytorch_model.bin + ``` #### 예시 3. GitHub에서 릴리스 다운로드 > [yousa-ling-diffsinger-v1.3](https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/tag/v1.3)를 예시로 사용합니다. 1. 다음 내용을 포함한 `cust.yaml`을 작성하고 저장합니다. - ```yaml - BaseURL: https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/download/v1.3 - Targets: - - Folder: . # 다운로드할 폴더 - Copy: # 다운로드할 파일 - - yousaV1.3.zip - ``` + ```yaml + BaseURL: https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/download/v1.3 + Targets: + - Folder: . # 다운로드할 폴더 + Copy: # 다운로드할 파일 + - yousaV1.3.zip + ``` 2. 같은 폴더에서 `rvcmd`를 실행합니다. - - ```bash + ```bash rvcmd -c cust - ``` + ``` ## 전체 사용법 @@ -99,37 +91,16 @@ Usage: rvcmd [-notrs] [-dns dns.yaml] 'target/to/download' -notui use plain text instead of TUI -ua string - customize user agent + customize user agent (default "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0") -w uint connection waiting seconds (default 4) 'target/to/download' like packs/general/latest All available targets: assets: - all hubert rmvpe uvr5 v1 v2 - packs: - amd: - latest - v2: - 20230813 20231006 - general: - latest - v1: - 20230331 20230416 20230428 20230508 20230513 20230516 20230717 - v2: - 20230528 20230618 - intel: - latest - v2: - 20230813 20231006 - nvidia: - latest - v2: - 20230813 20231006 - tools: - ffmpeg + chtts hubert rmvpe rvc uvr5 v1 v2 ``` ## 데모 비디오 -https://github.com/RVC-Project/RVC-Models-Downloader/assets/41315874/da2b5827-8b1a-45f8-a9c0-03a5618ad5f8 +https://github.com/fumiama/RVC-Models-Downloader/assets/41315874/da2b5827-8b1a-45f8-a9c0-03a5618ad5f8 diff --git a/README_sc.md b/README_sc.md index 52f03e4..162809b 100644 --- a/README_sc.md +++ b/README_sc.md @@ -4,13 +4,13 @@ 一个能够批量下载`yaml`清单内文件的简单工具(例如 Hugging Face 🤗 中的 RVC 模型)。 -![tui demo](https://github.com/RVC-Project/RVC-Models-Downloader/assets/41315874/db577dfb-8a6d-4909-b071-9d36cc77afc6) +![tui demo](https://github.com/fumiama/RVC-Models-Downloader/assets/41315874/db577dfb-8a6d-4909-b071-9d36cc77afc6) ## 快速开始 ### 准备工作 -1. 在[发布](https://github.com/RVC-Project/RVC-Models-Downloader/releases)页面下载程序。 +1. 在[发布](https://github.com/fumiama/RVC-Models-Downloader/releases)页面下载程序。 2. 将此程序放入 RVC 的根目录(或您想要下载文件的任何位置)。 3. 您也可以将它添加到`PATH`中以便在任何地方使用此工具。如果您已经通过包管理器安装了此程序,那么它可能已经位于`PATH`。 @@ -22,67 +22,60 @@ rvcmd assets/all ``` -#### RVC 的最新通用整合包(仅限 Windows) - -```bash -rvcmd packs/general/latest -``` - -#### ffmpeg 工具(仅限 Windows) - +#### ChatTTS 的所有资源文件 ```bash -rvcmd tools/ffmpeg +rvcmd -w 1 assets/chtts ``` ### 自定义下载 -#### 示例 1. 下载 ffmpeg 工具和最新的 Intel 包 +#### 示例 1. 下载 hubert 和 rmvpe 1. 编写并保存以下`cust.yaml`。 - ```yaml - BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main - Targets: - - Refer: tools/ffmpeg - - Refer: packs/intel/latest - ``` + ```yaml + BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main + Targets: + - Refer: hubert + - Refer: rmvpe + ``` 2. 在同一文件夹中运行`rvcmd`。 - ```bash - rvcmd -c cust - ``` + ```bash + rvcmd -c cust + ``` #### 示例 2. 下载 🤗 中的其他仓库 > 以 [Stable Diffusion v1-5](https://huggingface.co/runwayml/stable-diffusion-v1-5) 为例。 1. 编写并保存以下`cust.yaml`。 - ```yaml - BaseURL: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main - Targets: - - Folder: sd1.5 # the folder you want to download into - Copy: # files to download - - v1-5-pruned-emaonly.ckpt - - v1-5-pruned-emaonly.safetensors - - Folder: sd1.5/vae # the folder you want to download into - Copy: # files to download - - vae/diffusion_pytorch_model.bin - ``` + ```yaml + BaseURL: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main + Targets: + - Folder: sd1.5 # the folder you want to download into + Copy: # files to download + - v1-5-pruned-emaonly.ckpt + - v1-5-pruned-emaonly.safetensors + - Folder: sd1.5/vae # the folder you want to download into + Copy: # files to download + - vae/diffusion_pytorch_model.bin + ``` #### 示例 3. 下载 GitHub 中的发布版本 > 以 [yousa-ling-diffsinger-v1.3](https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/tag/v1.3) 为例。 1. 编写并保存以下`cust.yaml`。 - ```yaml - BaseURL: https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/download/v1.3 - Targets: - - Folder: . # the folder you want to download into - Copy: # files to download - - yousaV1.3.zip - ``` + ```yaml + BaseURL: https://github.com/yousa-ling-official-production/yousa-ling-diffsinger-v1/releases/download/v1.3 + Targets: + - Folder: . # the folder you want to download into + Copy: # files to download + - yousaV1.3.zip + ``` 2. 在同一文件夹中运行`rvcmd`。 - ```bash - rvcmd -c cust - ``` + ```bash + rvcmd -c cust + ``` ## 完整用法 @@ -97,37 +90,16 @@ Usage: rvcmd [-notrs] [-dns dns.yaml] 'target/to/download' -notui use plain text instead of TUI -ua string - customize user agent + customize user agent (default "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0") -w uint connection waiting seconds (default 4) 'target/to/download' like packs/general/latest All available targets: assets: - all hubert rmvpe uvr5 v1 v2 - packs: - amd: - latest - v2: - 20230813 20231006 - general: - latest - v1: - 20230331 20230416 20230428 20230508 20230513 20230516 20230717 - v2: - 20230528 20230618 - intel: - latest - v2: - 20230813 20231006 - nvidia: - latest - v2: - 20230813 20231006 - tools: - ffmpeg + chtts hubert rmvpe rvc uvr5 v1 v2 ``` ## 示例录屏 -https://github.com/RVC-Project/RVC-Models-Downloader/assets/41315874/da2b5827-8b1a-45f8-a9c0-03a5618ad5f8 +https://github.com/fumiama/RVC-Models-Downloader/assets/41315874/da2b5827-8b1a-45f8-a9c0-03a5618ad5f8 diff --git a/assets/chtts.yaml b/assets/chtts.yaml new file mode 100644 index 0000000..f35e89c --- /dev/null +++ b/assets/chtts.yaml @@ -0,0 +1,17 @@ +BaseURL: https://huggingface.co/2Noise/ChatTTS/resolve/main +Targets: + - Folder: asset + Copy: + - asset/DVAE.pt + - asset/Decoder.pt + - asset/GPT.pt + - asset/Vocos.pt + - asset/spk_stat.pt + - asset/tokenizer.pt + - Folder: config + Copy: + - config/decoder.yaml + - config/dvae.yaml + - config/gpt.yaml + - config/path.yaml + - config/vocos.yaml diff --git a/assets/hubert.yaml b/assets/hubert.yaml index 43761c5..cc81bcc 100644 --- a/assets/hubert.yaml +++ b/assets/hubert.yaml @@ -1,5 +1,5 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main +BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main Targets: - Folder: assets/hubert Copy: - - hubert_base.pt + - hubert/hubert_base.pt diff --git a/assets/rmvpe.yaml b/assets/rmvpe.yaml index 50d948d..b26d869 100644 --- a/assets/rmvpe.yaml +++ b/assets/rmvpe.yaml @@ -1,6 +1,6 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main +BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main Targets: - Folder: assets/rmvpe Copy: - - rmvpe.pt - - rmvpe.onnx + - rmvpe/rmvpe.pt + - rmvpe/rmvpe.onnx diff --git a/assets/all.yaml b/assets/rvc.yaml similarity index 53% rename from assets/all.yaml rename to assets/rvc.yaml index 7a6338d..991a3ee 100644 --- a/assets/all.yaml +++ b/assets/rvc.yaml @@ -1,4 +1,4 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main +BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main Targets: - Refer: hubert - Refer: rmvpe diff --git a/assets/uvr5.yaml b/assets/uvr5.yaml index 0591fc5..2324e2c 100644 --- a/assets/uvr5.yaml +++ b/assets/uvr5.yaml @@ -1,4 +1,4 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main +BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main Targets: - Folder: assets/uvr5_weights Copy: diff --git a/assets/v1.yaml b/assets/v1.yaml index cc2e719..a407219 100644 --- a/assets/v1.yaml +++ b/assets/v1.yaml @@ -1,4 +1,4 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main +BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main Targets: - Refer: hubert - Folder: assets/pretrained diff --git a/assets/v2.yaml b/assets/v2.yaml index a7f5615..ab03b10 100644 --- a/assets/v2.yaml +++ b/assets/v2.yaml @@ -1,4 +1,4 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main +BaseURL: https://huggingface.co/fumiama/RVC-Pretrained-Models/resolve/main Targets: - Refer: hubert - Folder: assets/pretrained_v2 diff --git a/main.go b/main.go index 2e3b856..f5ad7ec 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( _ "rvcmd/console" ) -//go:generate ./pckcfg.sh assets packs tools +//go:generate ./pckcfg.sh assets var ( notui = false @@ -32,10 +32,11 @@ func main() { force := flag.Bool("f", false, "force download even file exists") wait := flag.Uint("w", 4, "connection waiting seconds") ua := flag.String("ua", defua, "customize user agent") + h := flag.Bool("h", false, "display this help") flag.BoolVar(¬ui, "notui", false, "use plain text instead of TUI") flag.Parse() args := flag.Args() - if len(args) != 1 { + if len(args) != 1 || *h { fmt.Println("Usage:", os.Args[0], "[-notrs] [-dns dns.yaml] 'target/to/download'") flag.PrintDefaults() fmt.Println(" 'target/to/download'\n like packs/general/latest") diff --git a/packs/amd/latest.yaml b/packs/amd/latest.yaml deleted file mode 100644 index 1924ad2..0000000 --- a/packs/amd/latest.yaml +++ /dev/null @@ -1,3 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Refer: v2/20231006 diff --git a/packs/amd/v2/20230813.yaml b/packs/amd/v2/20230813.yaml deleted file mode 100644 index 5cdb648..0000000 --- a/packs/amd/v2/20230813.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC0813AMD_Intel.7z - OS: windows - Arch: amd64 diff --git a/packs/amd/v2/20231006.yaml b/packs/amd/v2/20231006.yaml deleted file mode 100644 index b62c099..0000000 --- a/packs/amd/v2/20231006.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC1006AMD_Intel.7z - OS: windows - Arch: amd64 diff --git a/packs/general/latest.yaml b/packs/general/latest.yaml deleted file mode 100644 index 9719d93..0000000 --- a/packs/general/latest.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230331.yaml b/packs/general/v1/20230331.yaml deleted file mode 100644 index 9b27d3b..0000000 --- a/packs/general/v1/20230331.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta-v20230331.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230416.yaml b/packs/general/v1/20230416.yaml deleted file mode 100644 index bd73f73..0000000 --- a/packs/general/v1/20230416.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta20230416.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230428.yaml b/packs/general/v1/20230428.yaml deleted file mode 100644 index e533c1c..0000000 --- a/packs/general/v1/20230428.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta20230428.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230508.yaml b/packs/general/v1/20230508.yaml deleted file mode 100644 index e222760..0000000 --- a/packs/general/v1/20230508.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta20230508.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230513.yaml b/packs/general/v1/20230513.yaml deleted file mode 100644 index dbc968a..0000000 --- a/packs/general/v1/20230513.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta-20230513.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230516.yaml b/packs/general/v1/20230516.yaml deleted file mode 100644 index b50dec5..0000000 --- a/packs/general/v1/20230516.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta20230516.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v1/20230717.yaml b/packs/general/v1/20230717.yaml deleted file mode 100644 index e60e327..0000000 --- a/packs/general/v1/20230717.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta0717.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v2/20230528.yaml b/packs/general/v2/20230528.yaml deleted file mode 100644 index 776b314..0000000 --- a/packs/general/v2/20230528.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta-v2-0528.7z - OS: windows - Arch: amd64 diff --git a/packs/general/v2/20230618.yaml b/packs/general/v2/20230618.yaml deleted file mode 100644 index 04b9a5f..0000000 --- a/packs/general/v2/20230618.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC-beta-v2-0618.7z - OS: windows - Arch: amd64 diff --git a/packs/intel/latest.yaml b/packs/intel/latest.yaml deleted file mode 100644 index 1924ad2..0000000 --- a/packs/intel/latest.yaml +++ /dev/null @@ -1,3 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Refer: v2/20231006 diff --git a/packs/intel/v2/20230813.yaml b/packs/intel/v2/20230813.yaml deleted file mode 100644 index 5cdb648..0000000 --- a/packs/intel/v2/20230813.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC0813AMD_Intel.7z - OS: windows - Arch: amd64 diff --git a/packs/intel/v2/20231006.yaml b/packs/intel/v2/20231006.yaml deleted file mode 100644 index b62c099..0000000 --- a/packs/intel/v2/20231006.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC1006AMD_Intel.7z - OS: windows - Arch: amd64 diff --git a/packs/nvidia/latest.yaml b/packs/nvidia/latest.yaml deleted file mode 100644 index 1924ad2..0000000 --- a/packs/nvidia/latest.yaml +++ /dev/null @@ -1,3 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Refer: v2/20231006 diff --git a/packs/nvidia/v2/20230813.yaml b/packs/nvidia/v2/20230813.yaml deleted file mode 100644 index 359ab47..0000000 --- a/packs/nvidia/v2/20230813.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC0813Nvidia.7z - OS: windows - Arch: amd64 diff --git a/packs/nvidia/v2/20231006.yaml b/packs/nvidia/v2/20231006.yaml deleted file mode 100644 index 917ebf3..0000000 --- a/packs/nvidia/v2/20231006.yaml +++ /dev/null @@ -1,7 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - RVC1006Nvidia.7z - OS: windows - Arch: amd64 diff --git a/tools/ffmpeg.yaml b/tools/ffmpeg.yaml deleted file mode 100644 index 34f7e04..0000000 --- a/tools/ffmpeg.yaml +++ /dev/null @@ -1,8 +0,0 @@ -BaseURL: https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main -Targets: - - Folder: . - Copy: - - ffmpeg.exe - - ffprobe.exe - OS: windows - Arch: amd64