From 250cc5084fc3801f10828420f775bdc518e60a13 Mon Sep 17 00:00:00 2001
From: flaskfarm <flaskfarm@gmail.com>
Date: Wed, 12 Oct 2022 13:16:19 +0900
Subject: [PATCH] update

---
 data/db/menu.yaml                             |  44 ------------------
 data/db/system.db                             | Bin 12288 -> 0 bytes
 files/requirements.txt                        |   4 +-
 ...ents_major.txt => requirements_normal.txt} |   3 ++
 lib/framework/init_main.py                    |   3 +-
 5 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 data/db/menu.yaml
 delete mode 100644 data/db/system.db
 rename files/{requirements_major.txt => requirements_normal.txt} (74%)

diff --git a/data/db/menu.yaml b/data/db/menu.yaml
deleted file mode 100644
index a8ac393..0000000
--- a/data/db/menu.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# 카테고리
-# uri 가 plugin인 경우 name 값은 대체
-
-#- name: "토렌트"
-#  list: 
-#    - uri: "rss"
-
-
-#- name: "기본 기능"
-#  list:
-#    - uri: "terminal"
-#    - uri: "command"
-#    - uri: "flaskfilemanager"
-#    - uri: "flaskcode"
-#    - uri: "number_baseball"
-
-
-#- name: "링크"
-#  list:
-#    - uri: "https://app.plex.tv"
-#      name: "Plex"
-#      target: "_self"
-#    - uri: "https://www.netflix.com"
-#      name: "Netflix"
-
-
-- name: "시스템"
-  list:
-    - uri: "system"
-      name: "설정"
-    - uri: "setting"
-      name: "확장 설정"
-    - uri: "system/plugin"
-      name: "플러그인 관리"
-    - uri: "-"
-    - uri: "system/logout"
-      name: "로그아웃"
-    - uri: "system/restart"
-      name: "재시작(업데이트)"
-    - uri: "system/shutdown"
-      #uri: "javascript:shutdown_confirm();"
-      name: "종료"
-
-  
\ No newline at end of file
diff --git a/data/db/system.db b/data/db/system.db
deleted file mode 100644
index c7cd2c549a1d75d499a06cd1be952a299c86f9f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI0&u<$=6vt=1+ct5tJNe~o^P}pvRn?f11UF4WQdz<Tr@vCSHF1B?pw(n|Y)`X4
z+}*KL1FcjL5`O^*#0_!bfXcZCByL=h5JK<=APz`9Aoa-1uGfu8rJguY%_ghNn>X*h
zna?<u-uLZm>x5#X>IW{O#yl7Vk_6r`3;;liy)t`~M`8mdG1y;jzvxMU*&7#C_!Oj|
z1fT>TzbHWX1pz@o5D)|e0YN|z5CjAPK|l}?1O$Qqguufk>42WiN*`t^+H!E%4k>oc
z5K~ILTCbH_Ef)(LMPsAz=6ccS^%>LYeqtLJN*l#<#j;VlvSE}e>+7!?>HcHexP8pH
zUMR1gFZ6m^$Z6u|dajl)TrQMv8JCK;jA>$Ld7et?!nI1#n2z#g)7i7B{rZ)x1c+zj
zd*NM&_3<WZQa`fI-tC#WUYqyzeVnJt-l>7p0R91gfj`1;;HU6ocp0w16A)^DX+LW}
zXy0jHXdh@udrQlxPu1Vm@6~VBFVzPFUk%)0f#MMa1OY)n5D)|e0YN|z5CjB)mzcof
zlmd?5ZXjAWn+?ZD_Ug*!jvs7qt~n^&UPFPqS>>ZDAK8ea&3M_;qykP=8cwrDJk!Q4
zlc#uLEL-^S=EOd*@X<jFJ2+^YAw>Z-E#GyKXUB8KOu^{ZoOKcLW;+hPF&r2(Gkjo^
zApic_tmS)EQoDUJIs%_(jo!(3@3TdYUvqE^J9*+&eP%a&-^th5j7OQp;;d#6V9#pj
zPscXPV^)cSd8*y1;}Tt0oIPlI9xG+ib_3@<L`e%zjVoYY?>X33+uXrhYsd-l;2{N^
zP&+3zDZWRc&e*G-Pf4{s+eWT4Ii`S|9#5FaZXplbW;4W5{6t0p%bnGxO+w2LY@WRC
z``eSFy8;tm5;!xWfJ%~;GVHYgxjX~!kj<zXvDg88FRC*+tbnsgo$hk0j;KlO@gW5)
z?Qv3n8+%iO{Pdm8cjJ;xWS|1()TC{VE}aq=LrnokhS*J+(N&#(ZAevsewfy=i&t^b
zbTIPt0R?3B0LLGdxInbiBL@{Qb3AbnkK%y!;JJB&{l3C~M$-xyKZ+WJ_3W>g&*g6B
z%B#66BmD|Es<Vxmu_wwk)W<fGVK_}nsDsb@E?zvqqA{Op>|A#jau;jw+^siuZd!Ad
ztJd;rp_Fs#cg}>13#ZPI?bgz{_eyT7v}onweio<mIASB)CEoBpmOCoQ4oYImhZO~6
zmTcP#>y$QD=H?vVLQdTe>B=&D24v>WH2i>a3#QnPp}l3ca1gS4%8g0vzSRI*?6YjT
z*lU{ce`1<_Q%$K)0KBiwY8h<}{>D^*ymmvYX`gEkv|qJH+TReWPc#Ys1pkC}Sb-<u
zCHM(^3?IR-;b$-L7o9koARq_`0)l`bAP5Kof`A|(2nYiIZvs$0F6|O;rbgsb(!WHR
z$wTsj)FVoCG>8dZp6_+UYQ^}Vd_vl-Qyk(|;=VhQDfBTp*Rgl26k`+eax$H05FLFY
zvnwKTu?Bo}TCOA!UB%#e!o<j=e0I;mjwCTWE-&rzMT*1_Kj3o&iNTCKC+(FYRQZV1
zRU)*0S(hRiLLHW~QX(?M*#<`CneJ4gI~+{Q<5H|Bq&4}d^h{vr=b5|GLLXljs|p8_
mA+h)KH9RDe2=?{K8HtMn3LkJ8K;|i*DFCUAoa^7)|NjGLo@W>U

diff --git a/files/requirements.txt b/files/requirements.txt
index 7e304a6..30be613 100644
--- a/files/requirements.txt
+++ b/files/requirements.txt
@@ -19,8 +19,6 @@ pytz
 requests==2.26.0
 discord-webhook
 pyyaml
-pycryptodome
 telepot-mod
 Flask-Dropzone
-lxml
-pillow
+
diff --git a/files/requirements_major.txt b/files/requirements_normal.txt
similarity index 74%
rename from files/requirements_major.txt
rename to files/requirements_normal.txt
index f289df8..360cc1a 100644
--- a/files/requirements_major.txt
+++ b/files/requirements_normal.txt
@@ -3,4 +3,7 @@ gevent
 gevent-websocket
 celery==5.0.5
 redis
+lxml
+pillow
 selenium==3.141.0
+pycryptodome
\ No newline at end of file
diff --git a/lib/framework/init_main.py b/lib/framework/init_main.py
index 45bbb7c..b6fb2a7 100644
--- a/lib/framework/init_main.py
+++ b/lib/framework/init_main.py
@@ -233,7 +233,8 @@ class Framework:
             self.config['notify_yaml_filepath'] = os.path.join(self.config['path_data'], 'db', 'notify.yaml')
         elif mode == "flask":
             self.app.secret_key = os.urandom(24)
-            #self.app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data/db/system.db?check_same_thread=False'
+            #db_path = os.path.join(self.config['path_data'], 'db', 'system.db')
+            #self.app.config['SQLALCHEMY_DATABASE_URI'] = f'sqlite:///{db_path}check_same_thread=False'
             self.app.config['SQLALCHEMY_BINDS'] = {}
             self.app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
             self.app.config['TEMPLATES_AUTO_RELOAD'] = True