porting to python3

cdhigh · Mar 26, 2024 · 7d01d94 · 7d01d94
1 parent 86badd7
commit 7d01d94
Show file tree

Hide file tree

Showing 19 changed files with 557 additions and 358 deletions.
diff --git a/application/back_end/db_models.py b/application/back_end/db_models.py
@@ -230,6 +230,7 @@ class InBox(MyBaseModel):
     sender = CharField()
     to = CharField()
     subject = CharField()
+    status = CharField()
     size = IntegerField(default=0)
     datetime = DateTimeField(default=datetime.datetime.utcnow)
     body = TextField(default='', index=False)

diff --git a/application/back_end/task_queue_apscheduler.py b/application/back_end/task_queue_apscheduler.py
@@ -22,8 +22,9 @@
 elif _broker_url.startswith(('sqlite://', 'mysql://', 'postgresql://')):
     from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
     jobstores = {"default": SQLAlchemyJobStore(url=_broker_url)}
-elif _broker_url == '':
-    jobstores = {} #default is memory store
+elif _broker_url == 'memory':
+    from apscheduler.jobstores.memory import MemoryJobStore
+    jobstores = {"default": MemoryJobStore()}
 else:
     raise ValueError('Unsupported TASK_QUEUE_BROKER_URL type: {_broker_url}')
 

diff --git a/application/back_end/task_queue_rq.py b/application/back_end/task_queue_rq.py
@@ -4,8 +4,9 @@
 #Author: cdhigh <https://github.com/cdhigh>
 import os, sys, json
 
-#启动rq
-#set FLASK_APP=main.py
+#启动rq的worker命令，在shell下执行
+#windows: set FLASK_APP=main.py
+#linux: export FLASK_APP=main.py
 #flask rq worker
 
 from flask_rq2 import RQ
@@ -15,9 +16,9 @@
 def init_task_queue_service(app):
     app.config['RQ_REDIS_URL'] = app.config['TASK_QUEUE_BROKER_URL']
     rq.init_app(app)
-    #windows不支持，暂时屏蔽，正式版本需要取消注释
-    #check_deliver.cron('0 */1 * * *', 'check_deliver') #每隔一个小时执行一次
-    #remove_logs.cron('0 0 */1 * *', 'remove_logs') #每隔24小时执行一次
+    #windows不支持，暂时屏蔽，正式版本需要取消注释, TODO
+    check_deliver.cron('40 */1 * * *', 'check_deliver') #每隔一个小时执行一次
+    remove_logs.cron('0 0 */1 * *', 'remove_logs') #每隔24小时执行一次
     return rq
 
 @rq.job

diff --git a/application/templates/base.html b/application/templates/base.html
@@ -91,7 +91,8 @@
     abbrUpl: '{{_("Upl")|safe}}',
     abbrSep: '{{_("Sep")|safe}}',
     abbrLog: '{{_("Log")|safe}}',
-    abbrEmb: '{{_("Emb")|safe}}'
+    abbrEmb: '{{_("Emb")|safe}}',
+    testEmailOk: '{{_("The test email has been successfully sent to [{0}]. Please check your inbox or spam folder to confirm its delivery. Depending on your email server, there may be a slight delay.")|safe}}'
   };
   </script>
   {% block javascript_inhead %}

diff --git a/application/templates/setting.html b/application/templates/setting.html
@@ -239,8 +239,11 @@
       {{_("You have not yet set up your email address. Please go to the 'Admin' page to add your email address firstly.")}}
     </p>
     {% endif %}
+    <hr/>
     <p style="text-align:center;">
-      <input type="submit" class="pure-button pure-button-primary pure-input-rounded" value="{{_('Save settings')}}" />
+      <button type="submit" class="pure-button pure-button-primary pure-input-rounded">{{_('Save settings')}} </button>
+      &nbsp;&nbsp;&nbsp;&nbsp;
+      <button type="button" class="pure-button pure-input-rounded" onclick="SendTestEmail()"> {{_("Send Test Email")}}</button>
     </p>
   </form>
 </div>
@@ -309,5 +312,17 @@
     $('#sm_save_path').hide();
   }
 }
+
+//发送测试邮件
+function SendTestEmail() {
+  $.post("/send_test_email", {url: window.location.href}, function (data) {
+    if (data.status == "ok") {
+      ShowSimpleModalDialog('<p>{0}</p>'.format(i18n.testEmailOk.format(data.email)));
+    } else {
+      alert(data.status);
+    }
+  });
+  return false;
+}
 </script>
 {% endblock -%}
diff --git a/application/translations/tr_TR/LC_MESSAGES/messages.mo b/application/translations/tr_TR/LC_MESSAGES/messages.mo