fix(serverlibrary): fix logfile path
This commit is contained in:
1 parent
2b7de8c43b
commit
e8db29c7b9
1 file changed
+17
-12
@@ -1,15 +1,15 @@
|
||||
import json
|
||||
import logging
|
||||
import re
|
||||
import sys
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
from datetime import datetime
|
||||
from difflib import SequenceMatcher
|
||||
from pathlib import Path
|
||||
from datetime import datetime
|
||||
|
||||
import requests
|
||||
import logging
|
||||
import colorlog
|
||||
import requests
|
||||
|
||||
# -----------------------------
|
||||
# Global Variables
|
||||
@@ -76,17 +76,21 @@ def setup_logging(
|
||||
root_logger.handlers.clear() # avoid duplicate logging
|
||||
logfile_data = "No Logfile"
|
||||
if logfile:
|
||||
ext = Path(logfile).suffix
|
||||
logfile_path = Path(logfile).expanduser()
|
||||
logfile_dir = Path.home() / "logs"
|
||||
logfile_name = logfile_path.name or "serverlibrary.log"
|
||||
if not Path(logfile_name).suffix:
|
||||
logfile_name = f"{logfile_name}.log"
|
||||
|
||||
if not ext:
|
||||
ext = ".log"
|
||||
logfile_name = f"{logfile}_{datetime.now():%Y%m%d_%H%M%S}{ext}"
|
||||
if no_date:
|
||||
logfile_name = f"{logfile}{ext}"
|
||||
final_name = logfile_name
|
||||
else:
|
||||
final_name = (
|
||||
f"{Path(logfile_name).stem}_{datetime.now():%Y%m%d_%H%M%S}{Path(logfile_name).suffix}"
|
||||
)
|
||||
|
||||
logfile_dir = Path.home() / "logs"
|
||||
logfile_dir.mkdir(exist_ok=True, parents=True)
|
||||
logfile_data = logfile_dir/ logfile_name
|
||||
logfile_data = logfile_dir / final_name
|
||||
|
||||
file_handler = logging.FileHandler(logfile_data, encoding="utf-8")
|
||||
file_handler.setFormatter(file_formatter)
|
||||
@@ -146,6 +150,7 @@ def safe_delete(path: Path, logger=None):
|
||||
logger.error(f"{path} does not exist")
|
||||
else:
|
||||
print(f"{path} does not exist")
|
||||
return
|
||||
if path.is_dir():
|
||||
shutil.rmtree(path)
|
||||
else:
|
||||
@@ -347,7 +352,7 @@ def get_audio_tracks(
|
||||
check=True,
|
||||
)
|
||||
|
||||
pattern = re.compile(r"\+\s+(\d+),\s+(.+?)\s+\((?:AC3|AAC|MP3|E-AC-3|DTS)")
|
||||
pattern = re.compile(r"\s*(\d+),\s+(.+?)\s+\([^)]+\)")
|
||||
|
||||
for match in pattern.finditer(result.stdout):
|
||||
tracks.append(
|
||||
|
||||
Reference in new issue
Block a user