reorg modules

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

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

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

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

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

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

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()

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()