diff --git a/docs/download&start/Android.md b/docs/download&start/Android.md
index d68b19d..56e3915 100644
--- a/docs/download&start/Android.md
+++ b/docs/download&start/Android.md
@@ -101,8 +101,7 @@
pip config set global.index-url http://mirrors.aliyun.com/pypi/simple/
# 然后安装(依次执行下面的指令)
apt-get install python-numpy
- pip install Musicreater[full] TrimLog
- python -m pip install --upgrade pip setuptools wheel
+ pip install -r requirements_cli.txt
```
- 如果出现以下情况,真是死了鬼的,我们要来再搞个设置:
@@ -118,8 +117,7 @@
之后再来安装即可
```bash
- pip install Musicreater[full] TrimLog
- python -m pip install --upgrade pip setuptools wheel
+ python -m pip install --upgrade -r requirements_cli.txt
```
安装成功后您可能会见到类似下图的提示:
diff --git a/docs/download&start/Linux.md b/docs/download&start/Linux.md
index d96c8f3..de4e6d0 100644
--- a/docs/download&start/Linux.md
+++ b/docs/download&start/Linux.md
@@ -1,7 +1,20 @@
-## 运行环境安装
-### 检验Python运行环境
+## 1控制台 使用 Docker
+
+请使用根目录下的 `Dockerfile` 来构建镜像,并运行镜像。
+
+## 2图形化用户界面
+
+*未完待续*
+
+------
+
+## 3**不建议** 手动安装
+
+### 运行环境安装
+
+#### 检验Python运行环境
0. 一般的Linux发行版都有安装Python环境,我们只需要保证其版本即可,理论上 ≥Python3.6 都可以运行我们的库
@@ -43,7 +56,7 @@
暂无
-### 检查并安装pip包管理器依赖
+#### 检查并安装pip包管理器依赖
1. 我们在安装依赖库之前,应该确认一下,Python自带的包管理器pip是否安装到位:
@@ -69,8 +82,7 @@
2. 确认完成之后,我们来安装一下依赖库:
```bash
- pip install Musicreater[full] -i https://mirrors.aliyun.com/pypi/simple/
- pip install TrimLog -i https://mirrors.aliyun.com/pypi/simple/
+ pip install -r requirements_cli.txt -i https://mirrors.aliyun.com/pypi/simple/
```
3. 安装成功后可能会见到类似下图的提示:
@@ -78,7 +90,7 @@
-## 本代码库的下载与使用
+### 本代码库的下载与使用
1. 使用Git下载本库及其示例代码
diff --git a/docs/download&start_EN/Linux.md b/docs/download&start_EN/Linux.md
index 910a991..1f0e1ca 100644
--- a/docs/download&start_EN/Linux.md
+++ b/docs/download&start_EN/Linux.md
@@ -1,7 +1,21 @@
-## Install Runtime Environment
-### Install and Verify Python Runtime
+
+## 1 CLI - Docker
+
+Using the `Dockerfile` in the root directory to build a Docker image, and run it.
+
+## 2 GUI
+
+*to be written*
+
+------
+
+## 3 **Not Recommended** Manually Run the CLI code
+
+### Install Runtime Environment
+
+#### Install and Verify Python Runtime
0. Common Linux Distributions do include a Python Runtime Environment, what we should do is only to check whether it is a satisfied version to our program. If the version ≥Python3.6, theoretically our program can be run.
@@ -43,7 +57,7 @@
None yet.
-### Install and Verify pip Package Manager
+#### Install and Verify pip Package Manager
1. Before installing, it is to be checked, wheather Python's pip is OK:
@@ -55,22 +69,21 @@
/usr/bin/python: No module named pip
# We can install pip via:
sudo pacman -S python-pip
- # Verfy, remember.
+ # Check, remember.
python -m pip
# If you did but failed, we should use other methods to install pip:
wget https://bootstrap.pypa.io/get-pip.py
sudo python get-pip.py
- # Verfy, must.
+ # Double check, must.
python -m pip
```
2. After checking, let's install the dependences.
```bash
- pip install mido -i
- pip install brotli -i
+ pip install -r requirements_cli.txt -i https://mirrors.aliyun.com/pypi/simple/
```
3. See the tips below as successfully installed:
@@ -78,25 +91,25 @@
-## Download this lib's sources code and Using its demos.
+### Download this lib's sources code and Using its demos.
1. Download via Git
```bash
- git clone -b pkgver https://github.com/TriM-Organization/Musicreater.git MSCTpkgver
+ git clone https://gitee.com/TriM-Organization/Linglun-Converter.git llc
```
- If succeed, a directory named `MSCTpkgver` well be found in the path you run this command, and inside it is the source code and demo(s) we wantted to download.
- What we want to use is the demo(s) so enter the folder via:
+ If succeed, a directory named `llc` well be found in the path you run this command, and inside it is the source codes we wantted to download.
+ What we want to use is in the folder so enter the folder via:
```bash
- cd MSCTpkgver
+ cd llc
```
-1. Starting Using Demo(s)
+1. Starting Using
Via
```bash
- python magicDemo.py
+ python llc_cli.py
```
diff --git a/llc_cli.py b/llc_cli.py
index 7eba9b5..da0b1c9 100644
--- a/llc_cli.py
+++ b/llc_cli.py
@@ -378,7 +378,7 @@ for singleMidi in midis:
else to_BDX_file_in_delay(cvt_mid, out_path, style, *prompts[3:])
)
if output_file_format == 1
- else (cvt_method(cvt_mid, out_path, *prompts[2:])) # type: ignore
+ else (cvt_method(cvt_mid, out_path, *prompts[2:])) # type: ignore
)
)
diff --git a/requirements_cli.txt b/requirements_cli.txt
new file mode 100644
index 0000000..acbb73d
--- /dev/null
+++ b/requirements_cli.txt
@@ -0,0 +1,5 @@
+Musicreater[full]>=2.1.0.1
+TrimLog>=0.8.3
+setuptools < 81
+requests>=2.0.0
+zhDateTime>=2.0.0
\ No newline at end of file
diff --git a/utils/yanlun.py b/utils/yanlun.py
index 97d054f..b7cb927 100644
--- a/utils/yanlun.py
+++ b/utils/yanlun.py
@@ -41,7 +41,7 @@ else:
try:
yanlun_texts = (
requests.get(
- "https://nd.liteyuki.icu/api/v3/share/content/Xpue?path=null",
+ "https://nd.liteyuki.org/api/v3/share/content/Xpue?path=null",
)
.text.strip("\n")
.split("\n")