이 참에 dev, beta, stable로 브랜치 변경

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
 <!--
-stable branch로 요청을 보내지 마십시오. 개발은 master branch에서 이루어집니다.
-Don't request merge your commit to stable branch, please request to master branch.
+stable, beta branch로 요청을 보내지 마십시오. 개발은 dev branch에서 이루어집니다.
+Don't request merge your commit to stable, beta branch, please request to dev branch.
 -->

app.py

@@ -11,9 +11,9 @@ for i_data in os.listdir("route"):
 # DB
 version_list = json.loads(open('version.json', encoding = 'utf8').read())
 
-print('Version : ' + version_list['master']['r_ver'])
-print('DB set version : ' + version_list['master']['c_ver'])
-print('Skin set version : ' + version_list['master']['s_ver'])
+print('Version : ' + version_list['lastest']['r_ver'])
+print('DB set version : ' + version_list['lastest']['c_ver'])
+print('Skin set version : ' + version_list['lastest']['s_ver'])
 print('----')
 
 while 1:
@@ -164,7 +164,7 @@ try:
     if not ver_set_data:
         setup_tool = 2
     else:
-        if int(version_list['master']['c_ver']) > int(ver_set_data[0][0]):
+        if int(version_list['lastest']['c_ver']) > int(ver_set_data[0][0]):
             setup_tool = 1
 except:
     setup_tool = 2
@@ -183,7 +183,7 @@ if setup_tool != 0:
         set_init()
 
 curs.execute(db_change('delete from other where name = "ver"'))
-curs.execute(db_change('insert into other (name, data) values ("ver", ?)'), [version_list['master']['c_ver']])
+curs.execute(db_change('insert into other (name, data) values ("ver", ?)'), [version_list['lastest']['c_ver']])
 conn.commit()
 
 # Init
@@ -396,7 +396,7 @@ def server_restart():
 
 @app.route('/update', methods=['GET', 'POST'])
 def server_now_update():
-    return server_now_update_2(conn, version_list['master']['r_ver'])
+    return server_now_update_2(conn, version_list['lastest']['r_ver'])
 
 @app.route('/xref/<everything:name>')
 def view_xref(name = None):
@@ -464,7 +464,7 @@ def main_other():
 @app.route('/manager', methods=['POST', 'GET'])
 @app.route('/manager/<int:num>', methods=['POST', 'GET'])
 def main_manager(num = 1):
-    return main_manager_2(conn, num, version_list['master']['r_ver'])
+    return main_manager_2(conn, num, version_list['lastest']['r_ver'])
 
 @app.route('/title_index')
 def list_title_index():
@@ -670,7 +670,7 @@ def api_raw(name = ''):
 
 @app.route('/api/version')
 def api_version():
-    return api_version_2(conn, version_list['master']['r_ver'], version_list['master']['c_ver'])
+    return api_version_2(conn, version_list['lastest']['r_ver'], version_list['lastest']['c_ver'])
 
 @app.route('/api/skin_info')
 @app.route('/api/skin_info/<name>')

emergency_tool.py

@@ -5,9 +5,9 @@ from route.tool.func import *
 # DB
 version_list = json.loads(open('version.json', encoding='utf8').read())
 
-print('Version : ' + version_list['master']['r_ver'])
-print('DB set version : ' + version_list['master']['c_ver'])
-print('Skin set version : ' + version_list['master']['s_ver'])
+print('Version : ' + version_list['lastest']['r_ver'])
+print('DB set version : ' + version_list['lastest']['c_ver'])
+print('Skin set version : ' + version_list['lastest']['s_ver'])
 print('----')
 
 while 1:

readme-en.md

@@ -3,7 +3,7 @@
 [![Up to Python 3.5](https://img.shields.io/badge/python->=%203.5-blue.svg)](https://python.org)
 [![LICENSE](https://img.shields.io/badge/license-BSD%203--Clause-lightgrey.svg)](./LICENSE)
 
-![](https://raw.githubusercontent.com/2du/openNAMU/master/.github/logo.png)
+![](https://raw.githubusercontent.com/2du/openNAMU/beta/.github/logo.png)
 
 openNAMU is a Python-based wiki engine. You can use openNAMU by installing Python and its dependency modules, and you can modify the code yourself to create more specialized wikis.
 
@@ -22,7 +22,8 @@ openNAMU is based upon Python, and it requires a Python environment.
 ## Clone
 You can clone this repository by entering the following command at the terminal (command prompt):
  * `git clone -b stable https://github.com/2du/openNAMU.git`
- * `git clone -b master https://github.com/2du/openNAMU.git`
+ * `git clone -b beta https://github.com/2du/openNAMU.git`
+ * `git clone -b dev https://github.com/2du/openNAMU.git`
 
 ## Contribute
 openNAMU may have some untested bugs. Your use of openNAMU and bug discovery will help develop openNAMU. [(Create Issues)](https://github.com/2du/openNAMU/issues/new)

readme.md

@@ -3,7 +3,7 @@
 [![Python 3.5 이상](https://img.shields.io/badge/python->=%203.5-blue.svg)](https://python.org)
 [![라이선스](https://img.shields.io/badge/license-BSD%203--Clause-lightgrey.svg)](./LICENSE)
 
-![](https://raw.githubusercontent.com/2du/openNAMU/master/.github/logo.png)
+![](https://raw.githubusercontent.com/2du/openNAMU/beta/.github/logo.png)
 
 오픈나무는 파이썬 기반의 위키 엔진입니다. 파이썬과 그 의존성 모듈만 설치하면 사용할 수 있으며, 코드를 직접 수정하여 좀 더 주제에 특화된 위키를 만들 수 있습니다.
 
@@ -23,7 +23,8 @@
 ## 클론
 아래 명령을 터미널(명령 프롬프트)에 입력하여 본 리포지토리를 클론할 수 있습니다.
  * `git clone -b stable https://github.com/2du/openNAMU.git`
- * `git clone -b master https://github.com/2du/openNAMU.git`
+ * `git clone -b beta https://github.com/2du/openNAMU.git`
+ * `git clone -b dev https://github.com/2du/openNAMU.git`
 
 ## 기여
 오픈나무에는 검증되지 않은 몇가지 버그가 존재할 수 있습니다. 당신의 오픈나무 사용과 버그 발견은 오픈나무의 발전을 돕습니다. [(이슈 생성하기)](https://github.com/2du/openNAMU/issues/new)

route/api_version.py

@@ -8,13 +8,10 @@ def api_version_2(conn, r_ver, c_ver):
 
     curs.execute(db_change('select data from other where name = "update"'))
     up_data = curs.fetchall()
-    if up_data:
-        up_data = up_data[0][0]
-    else:
-        up_data = 'stable'
+    up_data = up_data[0][0] if up_data else 'stable'
 
     try:
-        data = urllib.request.urlopen('https://raw.githubusercontent.com/2du/openNAMU/master/version.json')
+        data = urllib.request.urlopen('https://raw.githubusercontent.com/2du/openNAMU/beta/version.json')
     except:
         data = None
 

route/server_now_update.py

@@ -53,7 +53,7 @@ def server_now_update_2(conn, r_ver):
                     <li>''' + load_lang('version') + ' : ' + r_ver + '''</li>
                     <li id="ver_send" style="display: none;">''' + load_lang('lastest') + ''' : </li>
                 </ul>
-                <a href="https://github.com/2du/openNAMU">(Master)</a> <a href="https://github.com/2du/openNAMU/tree/stable">(Stable)</a>
+                <a href="https://github.com/2du/openNAMU">(Beta)</a> <a href="https://github.com/2du/openNAMU/tree/stable">(Stable)</a>
                 <hr class=\"main_hr\">
                 <form method="post">
                     <button type="submit">''' + load_lang('update') + '''</button>

route/setting.py

@@ -125,9 +125,9 @@ def setting_2(conn, num, db_set):
             branch_div =''
             if d_list[12] == 'stable':
                 branch_div += '<option value="stable">stable</option>'
-                branch_div += '<option value="master">master</option>'
+                branch_div += '<option value="beta">beta</option>'
             else:
-                branch_div += '<option value="master">master</option>'
+                branch_div += '<option value="beta">beta</option>'
                 branch_div += '<option value="stable">stable</option>'
 
             if db_set != 'sqlite':

version.json

@@ -1,6 +1,6 @@
 {
-    "master" : {
-        "r_ver" : "v3.2.0-master-22 (v3.2.0-dev-202008010-03)",
+    "lastest" : {
+        "r_ver" : "v3.2.0-beta-23 (v3.2.0-dev-202008010-03)",
         "c_ver" : "3202200",
         "s_ver" : "9"
     }, "stable" : {