Merge branch 'dev' into bug/backup-reload

2024-08-30 18:23:09 +00:00 · 2022-08-14 18:36:27 +01:00 · 2022-08-14 18:36:27 +01:00 · e2a4e096a2
commit e2a4e096a2
parent 1545c1415c 246ad37b34
10 changed files with 44 additions and 24 deletions
--- a/.gitlab/release.yml
+++ b/.gitlab/release.yml
@ -11,13 +11,15 @@ release:
  script:
    - echo "Build Job $JOB_ID"
    - echo "Running release job for tag $CI_COMMIT_TAG"
-  release:
-    name: Crafty $CI_COMMIT_TAG
-    tag_name: $CI_COMMIT_TAG
-    description: ./CHANGELOG.md
-    ref: $CI_COMMIT_TAG
-    assets:
-      links:
-        - name: Windows Package
-          url: "$CI_PROJECT_URL/-/jobs/$JOB_ID/artifacts/download"
-          link_type: package
+    - |
+      full_changelog=$(cat CHANGELOG.md)
+      trimmed_changelog="${full_changelog%%<br><br>*}"
+      echo "$trimmed_changelog"
+    - release-cli create
+      --name "Crafty $CI_COMMIT_TAG"
+      --description "$trimmed_changelog"
+      --tag-name "$CI_COMMIT_TAG"
+      --ref "$CI_COMMIT_TAG"
+      --assets-link "{\"url\":\"$CI_PROJECT_URL/-/jobs/$JOB_ID/artifacts/download\",\"name\":\"Windows Package\",\"link_type\":\"package\"}"
+# Having to use raw release-cli instead of yaml syntax because variables are not expanding
+# https://gitlab.com/gitlab-org/gitlab/-/issues/237893#note_403465700
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,9 +3,13 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix reaction tasks not firing ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
+- QOL task delay offset not following over on task edit ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
+- Fix Fresh Install Detection Logic issues ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/425))
 ### Tweaks
-TBD
+- Session Handling | Logout on browser close ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/424))
+- Backups Panel | Only display zips ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/426))
+- User creation | Fix page browser title ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/427))
 ### Lang
 TBD
 <br><br>
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@ -107,6 +107,12 @@ class HelperUsers:
            usernames.append(user.username)
        return usernames

+    @staticmethod
+    def get_user_total():
+        count = Users.select().where(Users.username != "system").count()
+        print(count)
+        return count
+
    @staticmethod
    def get_all_user_ids() -> t.List[int]:
        return [
--- a/app/classes/shared/main_models.py
+++ b/app/classes/shared/main_models.py
@ -30,9 +30,8 @@ class DatabaseBuilder:

    def is_fresh_install(self):
        try:
-            user = self.users_helper.get_by_id(1)
-            if user:
-                return False
+            num_user = self.users_helper.get_user_total()
+            return num_user <= 0
        except:
            return True

--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@ -1023,6 +1023,7 @@ class ServerInstance:
                "size": f["size"],
            }
            for f in files
+            if f["path"].endswith(".zip")
        ]

    def jar_update(self):
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@ -3,7 +3,7 @@ import time
 import logging
 import threading
 import asyncio
-from datetime import datetime
+import datetime

 from tzlocal import get_localzone
 from tzlocal.utils import ZoneInfoNotFoundError
@ -199,7 +199,7 @@ class TasksManager:
            "interval",
            hours=12,
            id="update_watcher",
-            start_date=datetime.now(),
+            start_date=datetime.datetime.now(),
        )
        # self.scheduler.add_job(
        #    self.scheduler.print_jobs, "interval", seconds=10, id="-1"
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@ -962,6 +962,7 @@ class PanelHandler(BaseHandler):
            page_data["schedule"]["command"] = ""
            page_data["schedule"]["one_time"] = False
            page_data["schedule"]["cron_string"] = ""
+            page_data["schedule"]["delay"] = 0
            page_data["schedule"]["time"] = ""
            page_data["schedule"]["interval"] = ""
            # we don't need to check difficulty here.
@ -1041,6 +1042,7 @@ class PanelHandler(BaseHandler):
                page_data["schedule"]["command"] = schedule.command
            else:
                page_data["schedule"]["command"] = ""
+            page_data["schedule"]["delay"] = schedule.delay
            page_data["schedule"]["enabled"] = schedule.enabled
            page_data["schedule"]["one_time"] = schedule.one_time
            page_data["schedule"]["cron_string"] = schedule.cron_string
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@ -15,7 +15,7 @@
  <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
  <link rel="stylesheet" href="/static/assets/vendors/fontawesome5/css/all.css">
  <link rel="stylesheet" type="text/css"
-        href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
+    href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
  <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
  <link rel="stylesheet" href="/static/assets/css/crafty.css">

@ -72,7 +72,7 @@
        {% include notify.html %}

        <button class="navbar-toggler navbar-toggler-right d-lg-none align-self-center" type="button"
-                data-toggle="offcanvas">
+          data-toggle="offcanvas">
          <span class="mdi mdi-menu"></span>
        </button>
      </div>
@ -163,7 +163,7 @@
  <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
  <script src="/static/assets/js/shared/misc.js"></script>
  <script type="text/javascript"
-          src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
+    src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
  <script type="text/javascript" src="/static/assets/js/motd.js"></script>

@ -191,7 +191,7 @@

    $.extend($.fn.dataTable.defaults, {
      // {{ '\nlanguage:' }} {% raw translate('datatables', 'i18n', data['lang']) %}
-      })
+    })

    //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
    function getCookie(name) {
@ -516,6 +516,9 @@
      });
    });

+    $(window).unload(function () {
+      jQuery.get("/public/logout")
+    });
  </script>

  {% block js %}
@ -525,4 +528,4 @@

 </body>

-</html>
+</html>
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@ -3,7 +3,9 @@
 {% block meta %}
 {% end %}

-{% block title %}Crafty Controller - Edit User{% end %}
+{% block title %}Crafty Controller - {{ translate('userConfig', 'userSettings',
+data['lang']) }}{% end %}
+

 {% block content %}

--- a/app/frontend/templates/panel/server_schedule_edit.html
+++ b/app/frontend/templates/panel/server_schedule_edit.html
@ -136,7 +136,8 @@
                      <label for="delay">{{ translate('serverScheduleConfig', 'offset' , data['lang']) }} <small
                          class="text-muted ml-1"> - {{ translate('serverScheduleConfig', 'offset-explain' ,
                          data['lang']) }}</small> </label>
-                      <input type="number" class="form-control" name="delay" id="delay" value="0">
+                      <input type="number" class="form-control" name="delay" id="delay"
+                        value="{{ data['schedule']['delay']}}">
                      <br>
                      <br>
                      <label for="parent">{{ translate('serverScheduleConfig', 'parent' , data['lang']) }} <small