코드 수정

route/tool/func.py

@@ -149,9 +149,7 @@ def python_to_golang_sync(func_name, other_set = {}):
             res = requests.post('http://localhost:' + db_data + '/', data = other_set)
             data = res.text
 
-            if "database is locked" == data:
-                pass
-            elif "error" == data:
+            if "error" == data:
                 raise
             else:
                 return data
@@ -174,9 +172,7 @@ async def python_to_golang(func_name, other_set = {}):
                 async with session.post('http://localhost:' + db_data + '/', data = other_set) as res:
                     data = await res.text()
 
-                    if "database is locked" == data:
-                        pass
-                    elif "error" == data:
+                    if "error" == data:
                         raise
                     else:
                         return data

route/view_w_raw.py

@@ -1,6 +1,8 @@
 from .tool.func import *
 
-def view_w_raw(name = '', rev = '', doc_acl = ''):
+from .go_api_w_raw import api_w_raw
+
+async def view_w_raw(name = '', rev = '', doc_acl = ''):
     with get_db_connect() as conn:
         rev_str = str(rev)
 
@@ -12,16 +14,16 @@ def view_w_raw(name = '', rev = '', doc_acl = ''):
         else:
             menu = [['w/' + url_pas(name), get_lang(conn, 'return')]]
 
+        data = json.loads((await api_w_raw(name, rev)).data)
+        if data["response"] == "ok":
+            data_in = data["data"]
+        else:
+            data_in = ''
+
         p_data = ''
         p_data += '''
             <div id="opennamu_preview_area">
-                <script defer src="/views/main_css/js/route/w_raw.js''' + cache_v() + '''"></script>
-                <textarea id="opennamu_editor_doc_name" style="display: none;">''' + html.escape(name) + '''</textarea>
-                <textarea id="opennamu_editor_rev" style="display: none;">''' + rev_str + '''</textarea>
-                <button id="opennamu_preview_button" type="button" onclick="opennamu_w_raw_preview();">''' + get_lang(conn, 'preview') + '''</button>
-                <hr class="main_hr">
-                <textarea readonly id="opennamu_edit_textarea" class="opennamu_textarea_500"></textarea>
-                <script>window.addEventListener("DOMContentLoaded", function() { opennamu_w_raw(); });</script>
+                <textarea readonly id="opennamu_edit_textarea" class="opennamu_textarea_500">''' + html.escape(data_in) + '''</textarea>
             </div>
         '''
         

views/main_css/js/route/w_raw.js

@@ -1,48 +0,0 @@
-"use strict";
-
-function opennamu_w_raw(render = '') {
-    let name = "test";
-    if(document.getElementById('opennamu_editor_doc_name')) {
-        name = opennamu_xss_filter_decode(document.getElementById('opennamu_editor_doc_name').innerHTML);
-    }
-
-    let rev = "";
-    if(document.getElementById("opennamu_editor_rev")) {
-        rev = document.getElementById("opennamu_editor_rev").innerHTML;
-    }
-
-    let url = "";
-    if(rev !== '') {
-        url = "/api/raw_rev/" + rev + "/" + opennamu_do_url_encode(name);
-    } else {
-        url = "/api/raw/" + opennamu_do_url_encode(name);
-    }
-
-    fetch(url).then(function(res) {
-        return res.json();
-    }).then(function(data) {
-        if(document.getElementById("opennamu_edit_textarea")) {
-            if(data["data"]) {
-                document.getElementById("opennamu_edit_textarea").value = data["data"];
-            }
-
-            if(render === 'do') {
-                opennamu_w_raw_preview();
-            }
-        }
-    });
-}
-
-function opennamu_w_raw_preview() {
-    let name = "test";
-    if(document.getElementById('opennamu_editor_doc_name')) {
-        name = opennamu_xss_filter_decode(document.getElementById('opennamu_editor_doc_name').innerHTML);
-    }
-
-    let data = "";
-    if(document.getElementById('opennamu_edit_textarea')) {
-        data = document.getElementById('opennamu_edit_textarea').value;
-    }
-
-    opennamu_do_render('opennamu_preview_area', data, name);
-}