update

lib/framework/init_main.py

@@ -61,9 +61,7 @@ class Framework:
         self.__make_default_dir()
         
         self.logger = self.get_logger(__package__)
-        
-        from support import set_logger
-        set_logger(self.logger)
+        import support
 
         self.__prepare_starting()
         self.app = Flask(__name__)
@@ -462,6 +460,8 @@ class Framework:
 
     def __app_close(self):
         try:
+            from support import SupportSubprocess
+            SupportSubprocess.all_process_close()
             from .init_plugin import PluginManager
             PluginManager.plugin_unload()
             self.socketio.stop()

lib/framework/init_route.py

@@ -40,6 +40,15 @@ def global_ajax(sub):
             return jsonify(ret)
         except:
             return jsonify({'ret':False})
+    elif sub == 'command_modal_hide':
+        from tool import ToolModalCommand
+        ToolModalCommand.modal_close()
+        return jsonify('')
+    elif sub == 'command_modal_input':
+        from tool import ToolModalCommand
+        cmd = request.form['cmd']
+        ToolModalCommand.input_command(cmd)
+        return jsonify('')
 
 
 

lib/framework/static/js/ff_common1.js

@@ -21,7 +21,10 @@ $(window).on("load resize", function (event) {
   $body.css("padding-top", $navbar.outerHeight());
 });  
 
-
+$('#command_modal').on('show.bs.modal', function (event) {
+  console.log('111111111')
+  console.log(event);
+})
 
 ///////////////////////////////////////
 // 사용 미확인

lib/framework/static/js/ff_global1.js

@@ -29,19 +29,6 @@ frameSocket.on('modal', function(data){
   m_modal(data.data, data.title, false);
 });
 
-frameSocket.on('command_modal_add_text', function(data){
-  document.getElementById("command_modal_textarea").innerHTML += data ;
-  document.getElementById("command_modal_textarea").scrollTop = document.getElementById("command_modal_textarea").scrollHeight;
-});
-
-frameSocket.on('command_modal_show', function(data){
-  command_modal_show(data)
-});
-
-frameSocket.on('command_modal_clear', function(data){
-  document.getElementById("command_modal_textarea").innerHTML = ""
-});
-
 frameSocket.on('loading_hide', function(data){
   $('#loading').hide();
 });
@@ -52,6 +39,16 @@ frameSocket.on('refresh', function(data){
 });
 
 
+$('#command_modal').on('hide.bs.modal', function (event) {
+  $.ajax({
+    url: `/global/ajax/command_modal_hide`,
+    type: 'POST',
+    cache: false,
+    data: {},
+    dataType: 'json'
+  });
+});
+
 
 
 
@@ -250,3 +247,50 @@ let listdir = (path = '/', only_dir = true) => {
 // 파일 선택 모달 End
 ///////////////////////////////////////
 
+
+///////////////////////////////////////
+// Command MODAL
+///////////////////////////////////////
+
+frameSocket.on('command_modal_add_text', function(data){
+  document.getElementById("command_modal_textarea").innerHTML += data ;
+  document.getElementById("command_modal_textarea").scrollTop = document.getElementById("command_modal_textarea").scrollHeight;
+});
+
+frameSocket.on('command_modal_input_disable', function(data){
+  $('#command_modal_input').attr('disabled', true);
+});
+
+frameSocket.on('command_modal_show', function(data){
+  command_modal_show(data)
+});
+
+frameSocket.on('command_modal_clear', function(data){
+  document.getElementById("command_modal_textarea").innerHTML = ""
+});
+
+function command_modal_show(title) {
+  ClientHeight = window.innerHeight
+  document.getElementById("command_modal_title").innerHTML = title
+  $("#command_modal").height(ClientHeight+50);
+  $("#command_modal_textarea").height(ClientHeight-380);
+  $("#command_modal").modal({backdrop: 'static', keyboard: false}, 'show');
+  $('#command_modal_input').attr('disabled', false);
+}
+
+$("body").on('click', '#command_modal_input_btn', function(e) {
+  e.preventDefault();
+  $.ajax({
+    url: '/global/ajax/command_modal_input',
+    type: "POST", 
+    cache: false,
+    data: {cmd:$('#command_modal_input').val()},
+    dataType: "json",
+    success: function (ret) {
+      $('#command_modal_input').val('');
+    }
+  });
+});
+
+///////////////////////////////////////
+

lib/framework/static/js/sjva_global1.js

@@ -66,13 +66,7 @@ $("body").on('click', '#global_downloader_add_btn', function(e){
   });
 });
 
-function command_modal_show(title) {
-  ClientHeight = window.innerHeight
-  document.getElementById("command_modal_title").innerHTML = title
-  $("#command_modal").height(ClientHeight-100);
-  $("#command_modal_textarea").height(ClientHeight-380);
-  $("#command_modal").modal();
-}
+
 
 
 // 토렌트 프로그램에 다운로드 추가할 결과를 보여주는

lib/framework/templates/macro_include.html

@@ -116,8 +116,14 @@
   <!--command modal-->
   {{ macros.m_modal_start('command_modal', '', 'modal-lg') }}
     <div>
-      <textarea id="command_modal_textarea" class="col-md-12" rows="30" disabled style="visibility:visible"></textarea>
+      <textarea id="command_modal_textarea" class="col-md-12" rows="30" disabled style="background-color:#ffffff;visibility:visible"></textarea>
     </div>
+    <form id='command_modal_form' name='command_form'>
+      <div class="form-inline input-group">
+        <input id="command_modal_input" name="command_modal_input" type="text" class="form-control form-control-sm" placeholder="">
+        <button id="command_modal_input_btn" class="btn btn-sm btn-outline-success">입력</button>
+      </div>
+    </form>
   {{ macros.m_modal_end() }}
   <!--command modal end-->
   <!-- Modal end -->