perf: 修改默认根目录增加备份文件夹

Author: Cassianvale

Diff for: src/backup.py

@@ -14,36 +14,45 @@ class Backup:
     def __init__(self):
         self.conf = read_conf.read_config()
         self.appName = 'PalServer-Win64-Test-Cmd.exe'
+        self.backup_source = os.path.join(self.conf['main_directory'], 'Pal', 'Saved')
 
     # 备份任务
     def backup_task(self):
         # 在当前目录下创建名为Backup的文件夹
-        backup_dir = 'Backup'
-        if not os.path.exists(backup_dir):
-            os.makedirs(backup_dir)
+        if self.conf['backup_dir'] == '':
+            backup_dir = 'Backup'
+            if not os.path.exists(backup_dir):
+                os.makedirs(backup_dir)
+        else:
+            backup_dir = self.conf['backup_dir']
+            if not os.path.exists(backup_dir):
+                os.makedirs(backup_dir)
 
         # 如果备份间隔不为空，则执行备份
         if self.conf['backup_interval']:
 
             INFO.logger.info("自动备份已开启，正在进行备份......")
             print("\n自动备份已开启，正在进行备份......")
+            try:
+                while True:
+                    datetime_now = datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
+
+                    # 备份文件
+                    shutil.copytree(self.backup_source, os.path.join(backup_dir, f"Saved_{datetime_now}"))
 
-            while True:
-                datetime_now = datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
-
-                # 备份文件
-                shutil.copytree(self.conf['backup_source'], os.path.join(backup_dir, f"Saved_{datetime_now}"))
-
-                time.sleep(1)
-                INFO.logger.info("备份成功，文件名为：Saved_" + datetime_now)
-                print("备份成功，文件名为：Saved_" + datetime_now)
-                # 存档备份位置
-                backup_path = os.path.join(os.getcwd(), backup_dir)
-                print(f"存档备份位置：{backup_path}")
-                # 显示倒计时并等待指定的备份间隔
-                for i in range(int(self.conf['backup_interval']), 0, -1):
-                    print(f'\r下一次备份将在 {i} 秒后开始...', end='')
                     time.sleep(1)
+                    INFO.logger.info("备份成功，文件名为：Saved_" + datetime_now)
+                    print("备份成功，文件名为：Saved_" + datetime_now)
+                    # 存档备份位置
+                    backup_path = os.path.join(os.getcwd(), backup_dir)
+                    print(f"存档备份位置：{backup_path}")
+                    # 显示倒计时并等待指定的备份间隔
+                    for i in range(int(self.conf['backup_interval']), 0, -1):
+                        print(f'\r下一次备份将在 {i} 秒后开始...', end='')
+                        time.sleep(1)
+            except FileNotFoundError as e:
+                INFO.logger.error(f"备份失败，{e}")
+                print(f"备份失败，{e}")
 
         # 备份时间必须大于等于60秒
         elif int(self.conf['backup_interval']) < 60:

Diff for: src/config.ini

@@ -1,9 +1,9 @@
 [Settings]
 # *PalServer程序路径
-program_path = D:\Steam\steamapps\common\PalServer\PalServer.exe
+main_directory = D:\Steam\steamapps\common\PalServer
 
-# *存档备份源目录(默认自动在当前目录创建Backup存档目录)
-backup_source = D:\Steam\steamapps\common\PalServer\Pal\Saved
+# 需要备份到的目录(为空的话则会默认在当前目录创建Backup存档目录)
+backup_dir =
 
 # 启动参数(从启动参数自定义端口和玩家数量,例如: arguments = -port=21424 -players=32)
 # 可以为空

Diff for: src/read_conf.py

@@ -4,15 +4,16 @@
 import codecs
 import configparser
 import json
-
+import os
 
 def read_config():
     # 读取配置文件
     config = configparser.ConfigParser()
-    with codecs.open('config.ini', 'r', encoding='utf-8-sig') as f:
+    config_path = os.path.join(os.path.dirname(__file__), 'config.ini')
+    with codecs.open(config_path, 'r', encoding='utf-8-sig') as f:
         config.read_file(f)
-    program_path = config.get('Settings', 'program_path')
-    backup_source = config.get('Settings', 'backup_source')
+    main_directory = config.get('Settings', 'main_directory')
+    backup_dir = config.get('Settings', 'backup_dir')
     arguments = config.get('Settings', 'arguments')
     use_multicore_options = config.getboolean('Settings', 'use_multicore_options')
     backup_interval_hours = config.getint('Settings', 'backup_interval_hours')
@@ -36,8 +37,8 @@ def read_config():
     backup_interval = (backup_interval_hours * 60 + backup_interval_minutes) * 60
 
     return {
-        'program_path': program_path,
-        'backup_source': backup_source,
+        'main_directory': main_directory,
+        'backup_dir': backup_dir,
         'arguments': arguments,
         'use_multicore_options': use_multicore_options,
         'rcon_enabled': rcon_enabled,

Diff for: src/task_scheduler.py

@@ -5,18 +5,20 @@
 import subprocess
 import time
 import psutil
-import rcon
-from src import read_conf
+import os
+import read_conf
 import threading
-from src.utils.log_control import INFO
+from utils.log_control import INFO
 from rcon.source import Client
 from rcon.source.proto import Packet
+from rcon.exceptions import WrongPassword
 
 
 class TaskScheduler:
     def __init__(self):
         self.conf = read_conf.read_config()
         self.appName = 'PalServer-Win64-Test-Cmd.exe'
+        self.program_path = os.path.join(self.conf['main_directory'], 'PalServer.exe')
         self.host = self.conf['rcon_host'],
         self.port = self.conf['rcon_port'],
         self.passwd = self.conf['rcon_password'],
@@ -57,7 +59,8 @@ def check_rcon(self):
                     time.sleep(1)
                 else:
                     return False
-            except rcon.exceptions.WrongPassword:
+
+            except WrongPassword:
                 INFO.logger.error("[ RCON ] RCON密码错误,请检查相关设置")
                 print("[ RCON ] RCON密码错误,请检查相关设置")
                 time.sleep(2)
@@ -67,7 +70,7 @@ def check_rcon(self):
     def start_program(self):
         INFO.logger.info("[ 启动任务 ] 正在启动程序......")
         print("[ 启动任务 ] 正在启动程序......")
-        program_args = [self.conf['program_path']]
+        program_args = self.program_path
 
         if self.conf['arguments']:
             INFO.logger.info("[ 启动任务 ] 已配置额外参数")