Merge pull request #996 from 2du/dev

Dev

app.py

@@ -731,11 +731,11 @@ app.secret_key = rep_key
 app.wsgi_app = werkzeug.debug.DebuggedApplication(app.wsgi_app, True)
 app.debug = True
 
-# https://stackoverflow.com/questions/31433682/control-wsgiref-simple-server-log
-class NoLoggingWSGIRequestHandler(wsgiref.simple_server.WSGIRequestHandler):
-    def log_message(self, format, *args):
-        pass
-
-httpd = wsgiref.simple_server.make_server(server_set['host'], int(server_set['port']), app, handler_class = NoLoggingWSGIRequestHandler)
 if __name__ == "__main__":
-    httpd.serve_forever()
+    if sys.platform == 'win32' and sys.version_info[0:2] >= (3, 8):
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+
+    http_server = tornado.httpserver.HTTPServer(tornado.wsgi.WSGIContainer(app))
+    http_server.listen(int(server_set['port']), address = server_set['host'])
+
+    tornado.ioloop.IOLoop.instance().start()

requirements.txt

@@ -1,5 +1,6 @@
 flask
 flask-Reggie
+tornado
 requests
 pymysql
 diff-match-patch

route/api_markup.py

@@ -5,7 +5,7 @@ def api_markup_2(conn):
 
     curs.execute(db_change('select data from other where name = "markup"'))
     rep_data = curs.fetchall()
-    if rep_data[0][0] != '':
+    if rep_data and rep_data[0][0] != '':
         return flask.jsonify({ "markup" : rep_data[0][0] })
     else:
         return flask.jsonify({})

route/api_raw.py

@@ -10,7 +10,5 @@ def api_raw_2(conn, name):
             json_data = { "title" : name, "data" : render_set(title = name, data = data[0][0], s_data = 1) }
 
             return flask.jsonify(json_data)
-        else:
-            return flask.jsonify({})
-    else:
-        return flask.jsonify({})
+        
+    return flask.jsonify({})

route/edit_delete.py

@@ -61,14 +61,14 @@ def edit_delete_2(conn, name, app_var):
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [name, wiki_set(), custom(), other2(['(' + load_lang('delete') + ')', 0])],
-            data =  '''
-                    <form method="post">
-                        ''' + ip_warring() + '''
-                        <input placeholder="''' + load_lang('why') + '''" name="send" type="text">
-                        <hr class=\"main_hr\">
-                        ''' + captcha_get() + '''
-                        <button type="submit">''' + load_lang('delete') + '''</button>
-                    </form>
-                    ''',
+            data = '''
+                <form method="post">
+                    ''' + ip_warring() + '''
+                    <input placeholder="''' + load_lang('why') + '''" name="send" type="text">
+                    <hr class=\"main_hr\">
+                    ''' + captcha_get() + '''
+                    <button type="submit">''' + load_lang('delete') + '''</button>
+                </form>
+            ''',
             menu = [['w/' + url_pas(name), load_lang('return')]]
         ))     

route/main_file.py

@@ -18,7 +18,5 @@ def main_file_2(conn, data):
                 return flask.send_from_directory('./', data, mimetype = 'text/plain')
             else:
                 return flask.send_from_directory('./', data, mimetype = 'text/xml')
-        else:
-            return main_error_404.main_error_404_2(conn)
-    else:
-        return main_error_404.main_error_404_2(conn)
+
+    return main_error_404.main_error_404_2(conn)

route/main_image_view.py

@@ -1,4 +1,5 @@
 from .tool.func import *
+from . import main_error_404
 
 def main_image_view_2(conn, name, app_var):
     curs = conn.cursor()
@@ -9,4 +10,4 @@ def main_image_view_2(conn, name, app_var):
             mimetype = 'image/' + re.search(r'\.([^\.]+)$', name).group(1)
         )
     else:
-        return redirect()
+        return main_error_404.main_error_404_2(conn)

route/tool/func.py

@@ -8,7 +8,9 @@ for i in range(0, 2):
         import werkzeug.routing
         import werkzeug.debug
         import flask_reggie
-        import wsgiref.simple_server
+        import tornado.ioloop
+        import tornado.httpserver
+        import tornado.wsgi
         import urllib.request
         import email.mime.text
         import requests

version.json

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