From d0b5bb4a252694729159792a381df638508edc54 Mon Sep 17 00:00:00 2001
From: flaskfarm <flaskfarm@gmail.com>
Date: Mon, 3 Oct 2022 03:04:09 +0900
Subject: [PATCH] test

---
 lib/framework/init_main.py  | 12 ++++------
 lib/framework/init_route.py | 48 +++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/lib/framework/init_main.py b/lib/framework/init_main.py
index 3853d81..20b7cbd 100644
--- a/lib/framework/init_main.py
+++ b/lib/framework/init_main.py
@@ -257,7 +257,6 @@ class Framework:
             # 아주 안좋은 구조..
             # celery user_options으로 configfilepath를 받은 후 처리해야하나, 로그파일 경로 등에서 데이터 폴더 위치를 미리 사용하는 경우가 많다.
             # sys.argv에서 데이터 경로를 바로 가져와서 사용.
-
             self.config['arg_repeat'] = 0
             self.config['arg_config'] = sys.argv[-1].split('=')[-1]
             #self.config['arg_config'] = 
@@ -268,14 +267,13 @@ class Framework:
         if self.config['arg_config'] == '.':
             #self.config['config_filepath'] = os.path.join(self.path_app_root, 'config.yaml')
             self.config['config_filepath'] = os.path.join(self.config['path_working'], 'config.yaml')
-
-            if not os.path.exists(self.config['config_filepath']):
-                shutil.copy(
-                    os.path.join(self.path_app_root, 'files', 'config.yaml.template'),
-                    self.config['config_filepath']
-                )
         else:
             self.config['config_filepath'] = self.config['arg_config']
+        if not os.path.exists(self.config['config_filepath']):
+            shutil.copy(
+                os.path.join(self.path_app_root, 'files', 'config.yaml.template'),
+                self.config['config_filepath']
+            )
 
         #os.environ['FLASK_FARM_CONFIG_FILEPATH'] = self.config['config_filepath']
         #else:
diff --git a/lib/framework/init_route.py b/lib/framework/init_route.py
index 58f1639..8828851 100644
--- a/lib/framework/init_route.py
+++ b/lib/framework/init_route.py
@@ -1,20 +1,16 @@
-# -*- coding: utf-8 -*-
-#########################################################
-# python
+import json
 import os
 import sys
-from datetime  import datetime, timedelta
-import json
 import traceback
+from datetime import datetime, timedelta
 
-# third-party
-from flask import redirect, render_template, Response, request, jsonify, send_from_directory
-from flask_login import login_user, logout_user, current_user, login_required
+import system
+from flask import (Response, jsonify, redirect, render_template, request,
+                   send_from_directory)
+from flask_login import current_user, login_required, login_user, logout_user
 
 # sjva 공용
-from framework import F, check_api, app, db, VERSION, logger, path_data
-import system
-
+from framework import VERSION, F 
 
 
 @F.app.route('/global/ajax/<sub>', methods=['GET', 'POST'])
@@ -47,11 +43,11 @@ def global_ajax(sub):
             import flaskcode
             return jsonify(True)
         except:
-            return jsonify(True)
+            return jsonify(False)
 
 
 
-@app.route('/robots.txt')
+@F.app.route('/robots.txt')
 def robot_to_root():
     return send_from_directory('', 'static/file/robots.txt')
 
@@ -76,33 +72,33 @@ def robot_to_root():
 
 
 
-@app.route("/")
-@app.route("/None")
-@app.route("/home")
+@F.app.route("/")
+@F.app.route("/None")
+@F.app.route("/home")
 def home():
     return redirect('/system/home')
 
 
-@app.route("/version")
+@F.app.route("/version")
 def get_version():
     return VERSION
 
-@app.route("/open/<path:path>")
+@F.app.route("/open/<path:path>")
 @login_required
 def open_file(path):
     return send_from_directory('/', path)
 
 
-@app.route("/file/<path:path>")
-@check_api
+@F.app.route("/file/<path:path>")
+@F.check_api
 def file2(path):
-    logger.debug('file2 :%s', path)
+    F.logger.debug('file2 :%s', path)
     return send_from_directory('/', path)
 
 
 
 
-@app.route("/up", methods=['GET', 'POST'])
+@F.app.route("/up", methods=['GET', 'POST'])
 def upload():
     # curl -F file=@downloader_video.tar https://dev.soju6jan.com/up
     # 
@@ -111,11 +107,11 @@ def upload():
             f = request.files['file']
             from werkzeug import secure_filename
             tmp = secure_filename(f.filename)
-            logger.debug('upload : %s', tmp)
-            f.save(os.path.join(path_data, 'upload', tmp))
+            F.logger.debug('upload : %s', tmp)
+            f.save(os.path.join(F.path_data, 'upload', tmp))
             return jsonify('success')
     except Exception as exception:
-        logger.error('Exception:%s', exception)
-        logger.error(traceback.format_exc())
+        F.logger.error('Exception:%s', exception)
+        F.logger.error(traceback.format_exc())
         return jsonify('fail')