From 9da71afb89430ecb049701716b168b951497ed23 Mon Sep 17 00:00:00 2001
From: bgArray <474037765@qq.com>
Date: Wed, 15 Mar 2023 12:04:20 +0800
Subject: [PATCH] update 2023/3/15 document/pre-library update/bug fixed

---
 docs/download&start/Android.md |  6 +++++-
 languages/lang.py              | 14 ++++++++------
 llc_cli.py                     |  6 +++---
 requirements.txt               |  4 ++--
 utils/io.py                    |  4 +++-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/docs/download&start/Android.md b/docs/download&start/Android.md
index 1820ea8..c3237ce 100644
--- a/docs/download&start/Android.md
+++ b/docs/download&start/Android.md
@@ -99,9 +99,12 @@
 	```bash
 	# 首先换源
 	pip config set global.index-url http://mirrors.aliyun.com/pypi/simple/
-	# 然后安装
+	# 然后安装（依次执行下面的指令）
 	pip install mido
 	pip install brotli
+	pip install Musicreater
+	pip install TrimLog
+	python -m pip install --upgrade pip setuptools wheel
 	```
 
 	- 如果出现以下情况，真是死了鬼的，我们要来再搞个设置：
@@ -121,6 +124,7 @@
 		pip install brotli
 		pip install Musicreater
 		pip install TrimLog
+		python -m pip install --upgrade pip setuptools wheel
 		```
 
 	安装成功后您可能会见到类似下图的提示：
diff --git a/languages/lang.py b/languages/lang.py
index 6b497ca..c527d28 100644
--- a/languages/lang.py
+++ b/languages/lang.py
@@ -85,14 +85,14 @@ languages = {
     }
 }
 
-class Lang():
 
-    def __init__(self, lang: str = "ZH-CN", debug:bool = False) -> None:
+class Lang:
+    def __init__(self, lang: str = "ZH-CN", debug: bool = False) -> None:
         self.local = lang
         self.debug = debug
 
-    
     def __load_language(self, language_file_name: str):
+        global logger
         with open(language_file_name, "r", encoding="utf-8") as languageFile:
             _text = {}
             for line in languageFile:
@@ -123,9 +123,11 @@ class Lang():
 # 这个函数是不被加载的
 def passbt():
 
-    from utils.io import logger, requests
-
-    
+    from utils.io import logger
+    try:
+        from utils.io import requests
+    except ImportError:
+        pass
 
     def __loadLanguage(languageFilename: str):
         with open(languageFilename, "r", encoding="utf-8") as languageFile:
diff --git a/llc_cli.py b/llc_cli.py
index 089dc40..f1b1adf 100644
--- a/llc_cli.py
+++ b/llc_cli.py
@@ -21,14 +21,14 @@ import os
 import random
 import sys
 
-print("小贴：不妨试试Mid-BDX转换网页：在线的多功能Midi转换器")
-print("https://dislink.github.io/midi2bdx/")
-
 import Musicreater
 
 from utils.io import *
 from languages.lang import languages
 
+print("小贴：不妨试试Mid-BDX转换网页：在线的多功能Midi转换器")
+print("https://dislink.github.io/midi2bdx/")
+
 MainConsole.print(
     "[#121110 on #F0F2F4]     ",
     style="#121110 on #F0F2F4",
diff --git a/requirements.txt b/requirements.txt
index 2a93599..8fc697b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Brotli>=1.0.9
 mido>=1.2.10
 rich>=10.9.0
-Musicreater>=0.1.0
-TrimLog>=0.1.0
+Musicreater>=0.3.2
+TrimLog>=0.7.2
diff --git a/utils/io.py b/utils/io.py
index 5057c05..e95cf8d 100644
--- a/utils/io.py
+++ b/utils/io.py
@@ -5,10 +5,12 @@ import urllib.error
 import TrimLog
 from TrimLog import Console, object_constants
 
+is_logging: bool = True
+
 MainConsole = Console()
 osc = object_constants.ObjectStateConstant()
 logger = TrimLog.Logger(
-    is_logging=True,
+    is_logging=is_logging,
     printing=not osc.isRelease,
     in_suffix=".llc",
 )