Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev

Browse Source
This commit is contained in:
luukas 2022-01-14 23:52:20 +02:00
commit ea3f36809d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -117,9 +117,9 @@ win-dev-build:
--paths .venv\Lib\site-packages --paths .venv\Lib\site-packages
--hidden-import cryptography --hidden-import cryptography
--hidden-import cffi --hidden-import cffi
--hidden-import apscheduler
--collect-all tzlocal --collect-all tzlocal
--collect-all tzdata --collect-all tzdata
--collect-all apscheduler
artifacts: artifacts:
name: "crafty-${CI_RUNNER_TAGS}-${CI_COMMIT_BRANCH}_${CI_COMMIT_SHORT_SHA}" name: "crafty-${CI_RUNNER_TAGS}-${CI_COMMIT_BRANCH}_${CI_COMMIT_SHORT_SHA}"
paths: paths:
@ -155,9 +155,9 @@ win-prod-build:
--paths .venv\Lib\site-packages --paths .venv\Lib\site-packages
--hidden-import cryptography --hidden-import cryptography
--hidden-import cffi --hidden-import cffi
--hidden-import apscheduler
--collect-all tzlocal --collect-all tzlocal
--collect-all tzdata --collect-all tzdata
--collect-all apscheduler
artifacts: artifacts:
name: "crafty-${CI_RUNNER_TAGS}-${CI_COMMIT_BRANCH}_${CI_COMMIT_SHORT_SHA}" name: "crafty-${CI_RUNNER_TAGS}-${CI_COMMIT_BRANCH}_${CI_COMMIT_SHORT_SHA}"
paths: paths:

1
app/classes/shared/server.py
View File

@ -14,6 +14,7 @@ import zlib
import html import html
import apscheduler import apscheduler
from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.schedulers.background import BackgroundScheduler
#TZLocal is set as a hidden import on win pipeline
from tzlocal import get_localzone from tzlocal import get_localzone

2
app/classes/web/ajax_handler.py
View File

@ -371,7 +371,7 @@ class AjaxHandler(BaseHandler):
return return
# Delete the file # Delete the file
if helper.validate_traversal(helper.get_os_understandable_path(server_info['path']), file_path): if helper.validate_traversal(helper.get_os_understandable_path(server_info['backup_path']), file_path):
os.remove(file_path) os.remove(file_path)
elif page == "del_dir": elif page == "del_dir":

4
app/classes/web/panel_handler.py
View File

@ -12,6 +12,8 @@ import shutil
import tempfile import tempfile
import threading import threading
from cron_validator import CronValidator from cron_validator import CronValidator
#TZLocal is set as a hidden import on win pipeline
from tzlocal import get_localzone
from tornado import locale from tornado import locale
from tornado import iostream from tornado import iostream
@ -81,7 +83,7 @@ class PanelHandler(BaseHandler):
page_data = { page_data = {
# todo: make this actually pull and compare version data # todo: make this actually pull and compare version data
'update_available': False, 'update_available': False,
'serverTZ': time.tzname, 'serverTZ':get_localzone(),
'version_data': helper.get_version_string(), 'version_data': helper.get_version_string(),
'user_data': exec_user_data, 'user_data': exec_user_data,
'user_role' : exec_user_role, 'user_role' : exec_user_role,