Преглед изворни кода

Merge pull request #2478 from openNAMU/dev

병렬스레드 패치
잉여개발기 пре 1 година
родитељ
комит
4553189b61
7 измењених фајлова са 35 додато и 30 уклоњено
  1. 2 2
      app.py
  2. 2 0
      readme-en.md
  3. 2 0
      readme.md
  4. 1 1
      route/tool/func.py
  5. 2 1
      route/view_w.py
  6. 2 2
      version.json
  7. 24 24
      views/main_css/js/func/insert_version.js

+ 2 - 2
app.py

@@ -25,7 +25,7 @@ data_db_set = class_check_json()
 do_db_set(data_db_set)
 
 with class_temp_db() as m_conn:
-    m_conn.execute('pragma journal_mode = DELETE')
+    m_conn.execute('pragma journal_mode = WAL')
 
 with get_db_connect(init_mode = True) as conn:
     curs = conn.cursor()
@@ -76,7 +76,7 @@ with get_db_connect(init_mode = True) as conn:
 
         conn.select_db(data_db_set['name'])
     else:
-        conn.execute('pragma journal_mode = DELETE')
+        conn.execute('pragma journal_mode = WAL')
 
     if setup_tool != 'normal':
         create_data = get_db_table_list()

+ 2 - 0
readme-en.md

@@ -38,3 +38,5 @@ openNAMU is protected by [BSD 3-Clause License](./LICNESE). Please refer to the
  * Owner rights are granted to the first registor.
  * [Test Server](http://2du.pythonanywhere.com)
  * [Contributors](https://github.com/openNAMU/openNAMU/graphs/contributors)
+ * [Old History 1](https://github.com/openNAMU/openNAMU-Backup)
+ * [Old History 2](https://github.com/openNAMU/Discard-openNAMU-Legacy)

+ 2 - 0
readme.md

@@ -48,3 +48,5 @@
  * 첫 가입자에게 소유자 권한이 부여됩니다.
  * [테스트 서버](http://2du.pythonanywhere.com)
  * [기여자 목록](https://github.com/openNAMU/openNAMU/graphs/contributors)
+ * [예전 히스토리 1](https://github.com/openNAMU/openNAMU-Backup)
+ * [예전 히스토리 2](https://github.com/openNAMU/Discard-openNAMU-Legacy)

+ 1 - 1
route/tool/func.py

@@ -1243,7 +1243,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v282'
+    return '.cache_v283'
 
 def wiki_css(data):
     with class_temp_db() as m_conn:

+ 2 - 1
route/view_w.py

@@ -2,6 +2,7 @@ from .tool.func import *
 
 from .go_api_w_raw import api_w_raw
 from .go_api_w_render import api_w_render
+from .go_api_w_page_view import api_w_page_view
 
 async def view_w(name = 'Test', do_type = ''):
     with get_db_connect() as conn:
@@ -189,7 +190,7 @@ async def view_w(name = 'Test', do_type = ''):
         else:
             end_data = ''
 
-        
+        await api_w_page_view(name)
 
         curs.execute(db_change("select data from data where title = ?"), [name])
         data = curs.fetchall()

+ 2 - 2
version.json

@@ -1,6 +1,6 @@
 {
-    "r_ver" : "v3.5.1-v23",
+    "r_ver" : "v3.5.1-v24",
     "c_ver" : "20241202",
     "s_ver" : "20240426",
-    "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2024-12-12-01/"
+    "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-01-16-v1/"
 }

+ 24 - 24
views/main_css/js/func/insert_version.js

@@ -1,31 +1,31 @@
 "use strict";
 
-function opennamu_do_insert_version(
-    dom_name_version_now, 
-    dom_name_version_new
-) {
-    let url = "/api/version";
-    let xhr = new XMLHttpRequest();
-    xhr.open("GET", url);
-    xhr.send();
+function opennamu_do_insert_version(dom_name_version_now, dom_name_version_new) {
+    fetch("/api/version").then(response => {
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        
+        return response.json();
+    }).then(get_data => {
+        document.getElementById(dom_name_version_now).innerHTML += get_data['version'];
 
-    xhr.onreadystatechange = function() {
-        if(this.readyState === 4 && this.status === 200) {
-            let get_data = JSON.parse(this.responseText);
-            document.getElementById(dom_name_version_now).innerHTML += get_data['version'];
-            
-            let url_2 = 'https://raw.githubusercontent.com/openNAMU/openNAMU/' + get_data['build'] + '/version.json';
-            let xhr_2 = new XMLHttpRequest();
-            xhr_2.open("GET", url_2);
-            xhr_2.send();
-            
-            xhr_2.onreadystatechange = function() {
-                if(this.readyState === 4 && this.status === 200) {
-                    document.getElementById(dom_name_version_new).innerHTML += JSON.parse(this.responseText)['beta']['r_ver'];
-                }
-            }
+        return fetch(`https://raw.githubusercontent.com/openNAMU/openNAMU/${get_data['build']}/version.json`);
+    }).then(response => {
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        return response.json();
+    }).then(versionData => {
+        if(versionData['beta'] !== undefined) {
+            document.getElementById(dom_name_version_new).innerHTML += versionData['beta']['r_ver'];
+        } else {
+            document.getElementById(dom_name_version_new).innerHTML += versionData['r_ver'];
         }
-    }
+    }).catch(error => {
+        console.error('Error:', error);
+    });
+    
 }
 
 let opennamu_do_insert_version_url = [