From dbe4d852b2a945c8dcc6eaaed03030536cbe7d2a Mon Sep 17 00:00:00 2001
From: flaskfarm <flaskfarm@gmail.com>
Date: Thu, 27 Oct 2022 16:02:16 +0900
Subject: [PATCH] update

---
 .gitignore                            |  2 ++
 cli/chage_ui.py                       | 26 ++++++++++++++++++++++++++
 lib/framework/static/js/ff_ui1.js     |  4 ++--
 lib/framework/version.py              |  2 +-
 lib/system/mod_tool.py                |  3 ++-
 lib/system/templates/system_home.html |  2 +-
 6 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 cli/chage_ui.py

diff --git a/.gitignore b/.gitignore
index e807451..b89f706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,4 +148,6 @@ lib/support/site/tving.py
 lib/support/site/wavve.py
 lib/support/site/seezn.py
 *.bat
+output/
+*.mkv
 
diff --git a/cli/chage_ui.py b/cli/chage_ui.py
new file mode 100644
index 0000000..cd98035
--- /dev/null
+++ b/cli/chage_ui.py
@@ -0,0 +1,26 @@
+import argparse
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib'))
+
+from support import SupportFile, logger
+
+
+class ChangeUI:
+    def change(self, target, old, new):
+        if target == 'macro':
+            target_filepath = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib', 'framework', 'templates', 'macro.html')
+            text = SupportFile.read_file(target_filepath)
+            SupportFile.write_file(target_filepath, text.replace(old, new))
+
+    def process_args(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--target', default='macro')
+        parser.add_argument('--old', default='btn-outline-primary')
+        parser.add_argument('--new', required=True)
+        args = parser.parse_args()
+        self.change(args.target, args.old, args.new)
+
+if __name__== "__main__":
+    ChangeUI().process_args()
diff --git a/lib/framework/static/js/ff_ui1.js b/lib/framework/static/js/ff_ui1.js
index 138df24..2883651 100644
--- a/lib/framework/static/js/ff_ui1.js
+++ b/lib/framework/static/js/ff_ui1.js
@@ -10,7 +10,7 @@ function j_button_group(h) {
 }
 
 // primary, secondary, success, danger, warning, info, light, dark, white
-function j_button(id, text, data={}, color='success', outline=true, small=false) {
+function j_button(id, text, data={}, color='primary', outline=true, small=false) {
   var str = '<button id="'+id+'" name="'+id+'" class="btn btn-sm btn';
   if (outline) {
     str += '-outline';
@@ -28,7 +28,7 @@ function j_button(id, text, data={}, color='success', outline=true, small=false)
   return str;
 }
 
-function j_button_small(id, text, data={}, color='success', outline=true) {
+function j_button_small(id, text, data={}, color='primary', outline=true) {
   return j_button(id, text, data, color, outline, true);
 }
 
diff --git a/lib/framework/version.py b/lib/framework/version.py
index 43b214c..31ba31e 100644
--- a/lib/framework/version.py
+++ b/lib/framework/version.py
@@ -1 +1 @@
-VERSION="4.0.43"
\ No newline at end of file
+VERSION="4.0.44"
\ No newline at end of file
diff --git a/lib/system/mod_tool.py b/lib/system/mod_tool.py
index 29a7ac3..5dfbb0c 100644
--- a/lib/system/mod_tool.py
+++ b/lib/system/mod_tool.py
@@ -49,7 +49,8 @@ class PagePython(PluginPageBase):
             if result['status'] == 'finish':
                 ret['data'] = []
                 for tmp in result['log'].split('\n'):
-                    ret['data'].append(tmp.split('=='))
+                    if '==' in tmp:
+                        ret['data'].append(tmp.split('=='))
             else:
                 ret['ret'] = 'danger'
                 ret['msg'] = "실패"
diff --git a/lib/system/templates/system_home.html b/lib/system/templates/system_home.html
index cb75356..a86acaf 100644
--- a/lib/system/templates/system_home.html
+++ b/lib/system/templates/system_home.html
@@ -11,7 +11,7 @@
  
   <h3>시스템</h3>
   <hr>
-  {{ macros.info_text_and_buttons('python_version', 'Python', [['globalLinkBtn', '패키지 관리', [('url','/system/python')]]], info['python_version']) }}
+  {{ macros.info_text_and_buttons('python_version', 'Python', [['globalLinkBtn', '패키지 관리', [('url','/system/tool/python')]]], info['python_version']) }}
   {{ macros.info_text('platform', 'Platform', info['platform']) }}
   {{ macros.info_text('processor', 'Processor', info['processor']) }}
   {{ macros.info_text_and_buttons('version_str', '버전',  [['globalOpenBtn', '업데이트 내역', [('url',arg['changelog'])]], ['recent_version_btn', '최신버전 확인']], info['version']) }}