refactor: Simplify pytz import and remove conditional checks
This commit is contained in:
@@ -17,6 +17,7 @@ import hashlib
|
|||||||
import os
|
import os
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import binascii
|
import binascii
|
||||||
|
import pytz
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import Dict, List, Optional
|
from typing import Dict, List, Optional
|
||||||
|
|
||||||
@@ -33,11 +34,6 @@ try:
|
|||||||
except Exception:
|
except Exception:
|
||||||
qrcode = None
|
qrcode = None
|
||||||
|
|
||||||
try:
|
|
||||||
import pytz
|
|
||||||
except ImportError:
|
|
||||||
pytz = None
|
|
||||||
|
|
||||||
from app.config import Settings, load_settings
|
from app.config import Settings, load_settings
|
||||||
|
|
||||||
# ---- App & static ----
|
# ---- App & static ----
|
||||||
@@ -264,8 +260,6 @@ def get_or_create_album_dir(album_name: str) -> str:
|
|||||||
|
|
||||||
if album_name == "public":
|
if album_name == "public":
|
||||||
try:
|
try:
|
||||||
if not pytz:
|
|
||||||
raise ImportError("pytz is not installed")
|
|
||||||
tz = pytz.timezone(SETTINGS.timezone)
|
tz = pytz.timezone(SETTINGS.timezone)
|
||||||
today = datetime.now(tz).strftime('%Y-%m-%d')
|
today = datetime.now(tz).strftime('%Y-%m-%d')
|
||||||
save_dir = os.path.join("./data/uploads", "public", today)
|
save_dir = os.path.join("./data/uploads", "public", today)
|
||||||
|
|||||||
Reference in New Issue
Block a user