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 pull request #24 from arcadia-technology/bug/file-size-check

Browse Source 
Bug/file size check
This commit is contained in:
Andrew McManus 2022-04-20 15:43:43 -04:00 committed by GitHub
commit 39a5b89b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/classes/shared/helpers.py
View File

@ -516,12 +516,15 @@ class Helpers:
full_path = os.path.join(path, file)
source_size += os.stat(full_path).st_size
files_count += 1
dest_size = os.path.getsize(str(dest_path))
percent = round((dest_size / source_size) * 100, 1)
try:
dest_size = os.path.getsize(str(dest_path))
percent = round((dest_size / source_size) * 100, 1)
except:
percent = 0
if percent >= 0:
results = {"percent": percent, "total_files": files_count}
else:
results = {"percent": 0, "total_files": 0}
results = {"percent": 0, "total_files": files_count}
return results
@staticmethod

5
app/classes/shared/main_controller.py
View File

@ -234,9 +234,8 @@ class Controller:
self.users.stop_prepare(exec_user["user_id"])
self.support_scheduler.remove_job("logs_" + str(exec_user["user_id"]))
@staticmethod
def add_system_user():
HelperUsers.add_user(
def add_system_user(self):
self.users_helper.add_user(
"system",
Helpers.random_string_generator(64),
"default@example.com",

3
app/classes/shared/main_models.py
View File

@ -2,6 +2,7 @@ import logging
from playhouse.shortcuts import model_to_dict
from app.classes.shared.helpers import Helpers # pylint: disable=unused-import
from app.classes.shared.console import Console
logger = logging.getLogger(__name__)
@ -14,7 +15,7 @@ class DatabaseBuilder:
def default_settings(self):
logger.info("Fresh Install Detected - Creating Default Settings")
self.helper.console.info("Fresh Install Detected - Creating Default Settings")
Console.info("Fresh Install Detected - Creating Default Settings")
default_data = self.helper.find_default_password()
username = default_data.get("username", "admin")

20
app/classes/web/public_handler.py
View File

@ -32,14 +32,18 @@ class PublicHandler(BaseHandler):
error = bleach.clean(self.get_argument("error", "Invalid Login!"))
error_msg = bleach.clean(self.get_argument("error_msg", ""))
page_data = {
"version": self.helper.get_version_string(),
"error": error,
"lang": self.helper.get_setting("language"),
"lang_page": self.helper.get_lang_page(self.helper.get_setting("language")),
"query": "",
}
try:
page_data = {
"version": self.helper.get_version_string(),
"error": error,
"lang": self.helper.get_setting("language"),
"lang_page": self.helper.get_lang_page(
self.helper.get_setting("language")
),
"query": "",
}
except:
self.redirect("/public/login.html")
if self.request.query:
page_data["query"] = self.request.query