update and upload pypi

Author: wu-clan

.gitignore

@@ -103,5 +103,7 @@ venv.bak/
 # mypy
 .mypy_cache/
 
-# add
+# idea
 .idea/
+
+poetry.lock

README.md

@@ -1,77 +1,17 @@
 # FastAPI Project Clone CLI
 
-> Ps: 浅用 [Typer](https://typer.tiangolo.com/)
+> 此程序使用 [Typer](https://typer.tiangolo.com/) 创建
 
 ## 使用
 
-###### P.S.: 未上传到 PyPi, 两种方式选其一, 按步骤在命令行执行即可
-
-### 1. 克隆仓库
-
-clone
-
-```shell
-git clone https://gitee.com/wu_cl/fastapi_ccli
-```
-
-install dep
-
-```shell
-poetry install
-```
-
-help
+pip 安装：
 
 ```shell
-# 进入 fastapi_ccli 目录下
-
-python main.py --help
+pip install fastapi-ccli
 ```
 
-run
+查看使用帮助
 
 ```shell
-# 进入 fastapi_ccli 目录下
-
-python main.py
-```
-
----
-
-### 2. 安装 whl 包
-
-install whl
-
-[点击下载](https://gitee.com/wu_cl/fastapi_ccli/raw/master/dist/fastapi_ccli-0.0.1-py3-none-any.whl)
-
-[备用1](https://github.com/wu-clan/fastapi_ccli/blob/master/dist/fastapi_ccli-0.0.1-py3-none-any.whl?raw=true)
-
-[备用2](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/wu-clan/fastapi_ccli/blob/master/dist/fastapi_ccli-0.0.1-py3-none-any.whl)
-
-pip install
-
-```shell
-# 在 whl 包存放目录执行:
-
-pip install fastapi_ccli-0.0.1-py3-none-any.whl
-```
-
-help
-
-```shell
-# 任意终端下执行
-
 fastapi-ccli --help
 ```
-
-run
-
-```shell
-# 任意终端下执行
-
-fastapi-ccli
-```
-
-## 测试
-
-根目录下执行 `pytest`

dist/fastapi_ccli-0.0.1-py3-none-any.whl

@@ -1,36 +1,42 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import sys
-from pathlib import Path
 
 import questionary
-import typer
 
-sys.path.append(str(Path(__file__).resolve().parent.parent))
-
-from fastapi_ccli.CN.cloner_zh import app_zh
-from fastapi_ccli.CN.cloner_zh_form import app_zh_form
-from fastapi_ccli.EN.cloner_en import app_en
-from fastapi_ccli.EN.cloner_en_form import app_en_form
+from fastapi_ccli.cloner.en.cloner_en import app_en
+from fastapi_ccli.cloner.en.cloner_en_form import app_en_form
+from fastapi_ccli.cloner.version import version
+from fastapi_ccli.cloner.zh.cloner_zh import app_zh
+from fastapi_ccli.cloner.zh.cloner_zh_form import app_zh_form
 
 
 def main():
+    if len(sys.argv) > 1:
+        if any(sys.argv[1] == _ for _ in ['--version', '-V']):
+            version()
     select_language = questionary.form(
-        language = questionary.select('Please select your language:', choices=['zh-hans', 'en'], default='en')
-    ).unsafe_ask()
-    if select_language['language'] == 'zh-hans':
-        interactive_zh = typer.confirm('是否以交互模式运行?', default=True)
-        if interactive_zh:
+        language=questionary.select('Please select your language:', choices=['zh-hans', 'en'], default='en')
+    ).ask()
+    if len(select_language) == 0:
+        sys.exit(0)
+    elif select_language['language'] == 'zh-hans':
+        select_run_type = questionary.form(
+            interactive=questionary.select('是否以交互模式运行?', choices=['yes', 'no'], default='yes')
+        ).ask()
+        if len(select_run_type) == 0:
+            sys.exit(0)
+        if select_run_type.get('interactive') == 'yes':
             app_zh_form()
         else:
             app_zh()
     else:
-        interactive_en = typer.confirm('Whether to run in interactive mode?', default=True)
-        if interactive_en:
+        select_run_type = questionary.form(
+            interactive=questionary.select('Whether to run in interactive mode?', choices=['yes', 'no'], default='yes')
+        ).ask()
+        if len(select_run_type) == 0:
+            sys.exit(0)
+        if select_run_type.get('interactive') == 'yes':
             app_en_form()
         else:
             app_en()
-
-
-if __name__ == '__main__':
-    main()

fastapi_ccli/main.py

@@ -18,7 +18,7 @@ def get_current_country(ip: Union[str, None]) -> str:
             rp = request.get(f'https://ip.useragentinfo.com/json?ip={ip}', proxies=proxy).json()['short_name']
         else:
             rp = request.get(f'https://ip.useragentinfo.com/json?ip=', proxies=proxy).json()['short_name']
-    except Exception:
+    except Exception:  # noqa
         rp = 'Unknown'
 
     return rp

fastapi_ccli/utils/get_country.py

@@ -19,7 +19,7 @@ def get_net_ip() -> str:
         ip = request.get('https://api.ipify.org/').text.strip()
         if not ip:
             ip = request.get('https://ip.42.pl/raw').text.strip()
-    except Exception:
+    except Exception:  # noqa
         ip = None
 
     return ip