在配置文件里写入 commit id (#126)

.github/workflows/deploy.yml

@@ -56,3 +56,5 @@ jobs:
           DEFAULT_CRON: "0 30 0 * * * *"
           DEFAULT_REGION: "ap-guangzhou"
           DEFAULT_FUNCTION_NAME: "NeteaseCloudMusicTasks"
+
+          SHA: ${{ github.sha }}

.github/workflows/upload.yml

@@ -28,6 +28,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Create config file
         run: mv config.example.json config.json
+      - name: Write sha to config file
+        run: sed -i "s/commitId/${{ github.sha }}/g" config.json
       - name: Setting environment variable
         run: | 
           ver=$(cat config.json | grep version | grep -o "[\.0-9]*")

config.example.json

@@ -1,6 +1,7 @@
 {
     /* 开源地址: https://github.com/chen310/NeteaseCloudMusicTasks */
     "version": "2.20",
+    "sha": "commitId",
     /* 多账号的配置详见 https://github.com/chen310/NeteaseCloudMusicTasks#%E5%A4%9A%E8%B4%A6%E5%8F%B7 */
     "users": [
         {

index.py

@@ -54,6 +54,7 @@ def start(event={}, context={}):
         config = json5.load(f)
 
     print('Version:', config['version'])
+    print('Commit ID:', config['sha'])
 
     # 公共配置
     setting = config['setting']

ql_update.py

@@ -1,5 +1,19 @@
 import os
 
+
+def writeSha(path, file):
+    cur = os.getcwd()
+    os.chdir(path)
+    result = os.popen('git rev-parse HEAD').read().strip()
+    os.chdir(cur)
+
+    if len(result) == 40 and ' ' not in result:
+        os.system('sed -i "s/commitId/{}/g" {}'.format(result, file))
+        print('已写入 commit id')
+    else:
+        print('commit id 获取失败')
+
+
 if __name__ == "__main__":
     github_url = 'https://github.com/chen310/NeteaseCloudMusicTasks.git'
 
@@ -21,12 +35,15 @@
         os.system('cp -f {} {}'.format(scripts_config, old_config))
         print('复制配置示例文件...')
         os.system('cp -f {} {}'.format(repo_config, example_config))
+        writeSha(os.path.dirname(repo_config), example_config)
         print('更新配置文件...')
         os.system('python3 {}scripts/chen310_NeteaseCloudMusicTasks/updateconfig.py {} {} {}'.format(
-            data_path, repo_config, scripts_config, scripts_config))
+            data_path, example_config, scripts_config, scripts_config))
         print('更新完成')
     else:
-        print('复制配置文件')
-        os.system('cp {} {}'.format(repo_config, scripts_config))
         print('复制配置示例文件...')
         os.system('cp -f {} {}'.format(repo_config, example_config))
+        writeSha(os.path.dirname(repo_config), example_config)
+        print('复制配置文件...')
+        os.system('cp {} {}'.format(example_config, scripts_config))
+

serverless/deploy.sh

@@ -22,6 +22,7 @@ else
 	config_file="config.json"
 	old_config_file="config.old.json"
 	example_config_file="config.example.json"
+	sed -i "s/commitId/$SHA/g" $example_config_file
 	# 复制模板文件为配置文件
 	cp $example_config_file $config_file
 	if [ -e "code/config.json" ]; then

updateconfig.py

@@ -1,5 +1,6 @@
 import json5
 import sys
+import os
 from utils import jsonDumps
 from utils import updateConfig
 
@@ -61,6 +62,16 @@ def processSetting(setting, template):
 
 
 def before(src, dst):
+    if 'sha' in src:
+        del src['sha']
+
+    if 'sha' in dst and dst['sha'] == 'commitId':
+        result = os.popen('git rev-parse HEAD').read().strip()
+        if len(result) == 40 and ' ' not in result:
+            dst['sha'] = result
+        else:
+            del dst['sha']
+
     for user in src['users']:
         if 'md5' in user:
             del user['md5']