From 2ec09677e8b95e5d6878072ccff19f677651c2f9 Mon Sep 17 00:00:00 2001 From: y1ndan Date: Mon, 4 Jan 2021 19:32:07 +0800 Subject: [PATCH] Revert to old get args method --- .github/workflows/main.yml | 2 +- README.md | 6 ++---- genshin.py | 11 +++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7782be..3dd943d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,5 +43,5 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - echo '${{ secrets.COOKIE }}' | tr '#' '\n' | sed 's/^/-c &/g' | sed 's/$/&${{ secrets.SCKEY }}/g' | xargs -I {} sh -c 'echo "{}" | python3 ./genshin.py' + echo '${{ secrets.COOKIE }}' | tr '#' '\n' | sed 's/$/&#${{ secrets.SCKEY }}/g' | xargs -I {} sh -c 'echo "{}" | python3 ./genshin.py' diff --git a/README.md b/README.md index a21426b..37e3a7f 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,7 @@ Genshin Impact Helper 可以自动化为你获取原神每日福利。 ![fork](https://i.loli.net/2020/10/28/qpXowZmIWeEUyrJ.png) -- 打开`Fork`后的仓库,将仓库默认分支设置为 master 分支 - -![default-master](https://i.loli.net/2021/01/04/eRYf8hTAvcOQnBI.jpg) +- 将仓库默认分支设置为 master 分支 ### 2. 获取 Cookie @@ -155,7 +153,7 @@ Error: Process completed with exit code 255. - 使用 GitHub 登录 [sc.ftqq.com](http://sc.ftqq.com/?c=github&a=login) 创建账号 - 点击「[发送消息](http://sc.ftqq.com/?c=code)」,获取`SCKEY` - 点击「[微信推送](http://sc.ftqq.com/?c=wechat&a=bind)」,完成微信绑定 -- 建立名为`SCKEY`的 secret,并添加获取的 SCKEY 值,即可开启订阅推送。注意必须加上`-s`,例子:`-s ` +- 建立名为`SCKEY`的 secret,并添加获取的 SCKEY 值,即可开启订阅推送 ## ❗️协议 diff --git a/genshin.py b/genshin.py index 6270105..7183160 100755 --- a/genshin.py +++ b/genshin.py @@ -278,11 +278,10 @@ def notify(sckey, status, message): if __name__ == '__main__': - parser = argparse.ArgumentParser() - parser.add_argument('-c', '--cookie', required=True, type=str, default='') - parser.add_argument('-s', '--sckey', type=str, default='') - args = parser.parse_args() - sckey = args.sckey + secret = input().strip().split('#') + secret.append('') + cookie = secret[0] + sckey = secret[1] - Sign(args.cookie).run() + Sign(cookie).run()