From 2357fa3d7efd527990a19dd27c461ebf52a18371 Mon Sep 17 00:00:00 2001
From: moicen <moicen@foxmail.com>
Date: Tue, 28 Jun 2022 23:46:51 +0800
Subject: [PATCH] reorg modules

---
 cp_scripts_alchemy.sh              | 7 ++++---
 cp_scripts_local_linux.sh          | 7 ++++---
 cp_scripts_local_macos.sh          | 7 ++++---
 cp_scripts_moicen.sh               | 7 ++++---
 scripts/form_upload_to_combine.lua | 2 ++
 scripts/lib/task_type.lua          | 8 ++++++++
 scripts/upload_audio.lua           | 5 +----
 scripts/wx_upload_to_combine.lua   | 1 +
 8 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 scripts/lib/task_type.lua

diff --git a/cp_scripts_alchemy.sh b/cp_scripts_alchemy.sh
index 8d7f4d4..429540c 100755
--- a/cp_scripts_alchemy.sh
+++ b/cp_scripts_alchemy.sh
@@ -21,10 +21,11 @@ echo $openresty_lua_scripts_dir
 # -- Make scripts dir
 mkdir -p $openresty_lua_scripts_dir
 # -- Copy scripts file
-cp scripts/*.lua $openresty_lua_scripts_dir
+cp -r scripts/* $openresty_lua_scripts_dir
 # -- Replace scripts path in file
-sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|" \
-  "$openresty_lua_scripts_dir"/*.lua
+sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|g" \
+  "$openresty_lua_scripts_dir"/*.lua  \
+  "$openresty_lua_scripts_dir"/lib/*.lua \
 
 # Reload openresty
 openresty -t
diff --git a/cp_scripts_local_linux.sh b/cp_scripts_local_linux.sh
index e194350..7830b77 100755
--- a/cp_scripts_local_linux.sh
+++ b/cp_scripts_local_linux.sh
@@ -21,10 +21,11 @@ echo $openresty_lua_scripts_dir
 # -- Make scripts dir
 mkdir -p $openresty_lua_scripts_dir
 # -- Copy scripts file
-cp scripts/*.lua $openresty_lua_scripts_dir
+cp -r scripts/* $openresty_lua_scripts_dir
 # -- Replace scripts path in file
-sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|" \
-  "$openresty_lua_scripts_dir"/*.lua
+sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|g" \
+  "$openresty_lua_scripts_dir"/*.lua \
+  "$openresty_lua_scripts_dir"/lib/*.lua \
 
 # Reload openresty
 openresty -t
diff --git a/cp_scripts_local_macos.sh b/cp_scripts_local_macos.sh
index 0340a65..8c7e623 100755
--- a/cp_scripts_local_macos.sh
+++ b/cp_scripts_local_macos.sh
@@ -21,14 +21,15 @@ echo $openresty_lua_scripts_dir
 # -- Make scripts dir
 mkdir -p $openresty_lua_scripts_dir
 # -- Copy scripts file
-cp scripts/*.lua $openresty_lua_scripts_dir
+cp -r scripts/* $openresty_lua_scripts_dir
 # -- Copy tests
 mkdir -p $openresty_lua_scripts_dir/tests/
 cp test_scripts/*.lua $openresty_lua_scripts_dir/tests/
 
 # -- Replace scripts path in file
-sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|" \
-  "$openresty_lua_scripts_dir"/*.lua
+sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|g" \
+  "$openresty_lua_scripts_dir"/*.lua \
+  "$openresty_lua_scripts_dir"/lib/*.lua \
 
 # Reload openresty
 openresty -t
diff --git a/cp_scripts_moicen.sh b/cp_scripts_moicen.sh
index 2e8f9f0..8c03e49 100755
--- a/cp_scripts_moicen.sh
+++ b/cp_scripts_moicen.sh
@@ -21,10 +21,11 @@ echo $openresty_lua_scripts_dir
 # -- Make scripts dir
 mkdir -p $openresty_lua_scripts_dir
 # -- Copy scripts file
-cp scripts/*.lua $openresty_lua_scripts_dir
+cp -r scripts/* $openresty_lua_scripts_dir
 # -- Replace scripts path in file
-sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|" \
-  "$openresty_lua_scripts_dir"/*.lua
+sed -i -e "s|<SCRIPT_PATH>|$openresty_lua_scripts_dir|g" \
+  "$openresty_lua_scripts_dir"/*.lua \
+  "$openresty_lua_scripts_dir"/lib/*.lua \
 
 # Reload openresty
 openresty -t
diff --git a/scripts/form_upload_to_combine.lua b/scripts/form_upload_to_combine.lua
index 3e45124..067b607 100644
--- a/scripts/form_upload_to_combine.lua
+++ b/scripts/form_upload_to_combine.lua
@@ -5,8 +5,10 @@ package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
 local upload = require "resty.upload"
 local uuid = require "resty.jit-uuid"
 local http = require "resty.http"
+local cjson = require "cjson"
 local verify = require('lib.jwt_verify')
 local create_task = require("lib.create_task")
+local TaskTypes = require 'lib.task_type'
 local httpc = http:new()
 local authHeader = ngx.req.get_headers().Authorization
 local sudoerToken = ngx.req.get_headers().HtySudoerToken
diff --git a/scripts/lib/task_type.lua b/scripts/lib/task_type.lua
new file mode 100644
index 0000000..461a843
--- /dev/null
+++ b/scripts/lib/task_type.lua
@@ -0,0 +1,8 @@
+local TaskTypes = {
+    NOOP = 'NOOP',
+    UPLOAD_PICTURE = 'UPLOAD_PICTURE',
+    CONVERT_AUDIO_FILE = 'CONVERT_AUDIO_FILE',
+    AI_RATE = 'AI_RATE'
+}
+
+return TaskTypes
\ No newline at end of file
diff --git a/scripts/upload_audio.lua b/scripts/upload_audio.lua
index 11c48ce..b552a98 100644
--- a/scripts/upload_audio.lua
+++ b/scripts/upload_audio.lua
@@ -2,10 +2,7 @@ package.path = package.path .. ';<SCRIPT_PATH>/?.lua';
 local cjson = require "cjson"
 local http = require "resty.http"
 local create_task = require "lib.create_task"
-local TaskTypes = {
-    NOOP = 'NOOP',
-    CONVERT_AUDIO_FILE = "CONVERT_AUDIO_FILE"
-}
+local TaskTypes = require 'lib.task_type'
 
 local httpc = http.new()
 ngx.req.read_body()
diff --git a/scripts/wx_upload_to_combine.lua b/scripts/wx_upload_to_combine.lua
index 17b6bfb..9decf01 100644
--- a/scripts/wx_upload_to_combine.lua
+++ b/scripts/wx_upload_to_combine.lua
@@ -7,6 +7,7 @@ local http = require 'resty.http'
 local get_wx_media = require("wx_download")
 local create_task = require("lib.create_task")
 local verify = require('lib.jwt_verify')
+local TaskTypes = require 'lib.task_type'
 local httpc = http:new()