Release 1.2: bulk upload, S3/SFTP/FTP, SMTP, password reset, user groups, git deploy
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+113
-1
@@ -1,5 +1,5 @@
|
||||
import uuid
|
||||
from datetime import datetime, timezone
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from flask_login import UserMixin
|
||||
from werkzeug.security import check_password_hash, generate_password_hash
|
||||
@@ -7,6 +7,85 @@ from werkzeug.security import check_password_hash, generate_password_hash
|
||||
from app import db
|
||||
|
||||
|
||||
class SiteSettings(db.Model):
|
||||
__tablename__ = "site_settings"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True, default=1)
|
||||
max_bulk_upload = db.Column(db.Integer, nullable=False, default=100)
|
||||
|
||||
s3_enabled = db.Column(db.Boolean, nullable=False, default=False)
|
||||
s3_endpoint = db.Column(db.String(255), nullable=True)
|
||||
s3_bucket = db.Column(db.String(120), nullable=True)
|
||||
s3_access_key = db.Column(db.String(120), nullable=True)
|
||||
s3_secret_key = db.Column(db.String(255), nullable=True)
|
||||
s3_region = db.Column(db.String(80), nullable=True, default="us-east-1")
|
||||
s3_public_url = db.Column(db.String(255), nullable=True)
|
||||
|
||||
sftp_enabled = db.Column(db.Boolean, nullable=False, default=False)
|
||||
sftp_host = db.Column(db.String(255), nullable=True)
|
||||
sftp_port = db.Column(db.Integer, nullable=False, default=22)
|
||||
sftp_username = db.Column(db.String(120), nullable=True)
|
||||
sftp_password = db.Column(db.String(255), nullable=True)
|
||||
sftp_remote_path = db.Column(db.String(255), nullable=True, default="/uploads")
|
||||
|
||||
ftp_enabled = db.Column(db.Boolean, nullable=False, default=False)
|
||||
ftp_host = db.Column(db.String(255), nullable=True)
|
||||
ftp_port = db.Column(db.Integer, nullable=False, default=21)
|
||||
ftp_username = db.Column(db.String(120), nullable=True)
|
||||
ftp_password = db.Column(db.String(255), nullable=True)
|
||||
ftp_remote_path = db.Column(db.String(255), nullable=True, default="/uploads")
|
||||
ftp_use_tls = db.Column(db.Boolean, nullable=False, default=False)
|
||||
|
||||
smtp_enabled = db.Column(db.Boolean, nullable=False, default=False)
|
||||
smtp_host = db.Column(db.String(255), nullable=True)
|
||||
smtp_port = db.Column(db.Integer, nullable=False, default=587)
|
||||
smtp_username = db.Column(db.String(120), nullable=True)
|
||||
smtp_password = db.Column(db.String(255), nullable=True)
|
||||
smtp_from_email = db.Column(db.String(120), nullable=True)
|
||||
smtp_from_name = db.Column(db.String(120), nullable=True, default="PhotoHost")
|
||||
smtp_use_tls = db.Column(db.Boolean, nullable=False, default=True)
|
||||
|
||||
updated_at = db.Column(
|
||||
db.DateTime,
|
||||
nullable=False,
|
||||
default=lambda: datetime.now(timezone.utc),
|
||||
onupdate=lambda: datetime.now(timezone.utc),
|
||||
)
|
||||
|
||||
|
||||
class PasswordResetToken(db.Model):
|
||||
__tablename__ = "password_reset_tokens"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False, index=True)
|
||||
token = db.Column(db.String(64), unique=True, nullable=False, index=True)
|
||||
expires_at = db.Column(db.DateTime, nullable=False)
|
||||
used = db.Column(db.Boolean, nullable=False, default=False)
|
||||
created_at = db.Column(
|
||||
db.DateTime,
|
||||
nullable=False,
|
||||
default=lambda: datetime.now(timezone.utc),
|
||||
)
|
||||
|
||||
user = db.relationship("User", backref="reset_tokens")
|
||||
|
||||
@staticmethod
|
||||
def create_for_user(user, hours=24):
|
||||
token = PasswordResetToken(
|
||||
user_id=user.id,
|
||||
token=uuid.uuid4().hex,
|
||||
expires_at=datetime.now(timezone.utc) + timedelta(hours=hours),
|
||||
)
|
||||
return token
|
||||
|
||||
def is_valid(self):
|
||||
now = datetime.now(timezone.utc)
|
||||
expires = self.expires_at
|
||||
if expires.tzinfo is None:
|
||||
expires = expires.replace(tzinfo=timezone.utc)
|
||||
return not self.used and expires > now
|
||||
|
||||
|
||||
class User(UserMixin, db.Model):
|
||||
__tablename__ = "users"
|
||||
|
||||
@@ -16,6 +95,7 @@ class User(UserMixin, db.Model):
|
||||
password_hash = db.Column(db.String(256), nullable=False)
|
||||
is_admin = db.Column(db.Boolean, nullable=False, default=False)
|
||||
is_active = db.Column(db.Boolean, nullable=False, default=True)
|
||||
group_id = db.Column(db.Integer, db.ForeignKey("user_groups.id"), nullable=True, index=True)
|
||||
created_at = db.Column(
|
||||
db.DateTime,
|
||||
nullable=False,
|
||||
@@ -24,6 +104,7 @@ class User(UserMixin, db.Model):
|
||||
|
||||
photos = db.relationship("Photo", backref="owner", lazy="dynamic")
|
||||
folders = db.relationship("Folder", backref="owner", lazy="dynamic")
|
||||
group = db.relationship("UserGroup", backref="users")
|
||||
|
||||
def set_password(self, password):
|
||||
self.password_hash = generate_password_hash(password)
|
||||
@@ -45,6 +126,31 @@ class User(UserMixin, db.Model):
|
||||
return int(result or 0)
|
||||
|
||||
|
||||
class UserGroup(db.Model):
|
||||
__tablename__ = "user_groups"
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
name = db.Column(db.String(80), unique=True, nullable=False)
|
||||
slug = db.Column(db.String(80), unique=True, nullable=False, index=True)
|
||||
disk_quota_mb = db.Column(db.Integer, nullable=False, default=100)
|
||||
is_default = db.Column(db.Boolean, nullable=False, default=False)
|
||||
created_at = db.Column(
|
||||
db.DateTime,
|
||||
nullable=False,
|
||||
default=lambda: datetime.now(timezone.utc),
|
||||
)
|
||||
|
||||
@property
|
||||
def user_count(self):
|
||||
return len(self.users)
|
||||
|
||||
@property
|
||||
def quota_label(self):
|
||||
if self.disk_quota_mb == 0:
|
||||
return "Без лимита"
|
||||
return f"{self.disk_quota_mb} МБ"
|
||||
|
||||
|
||||
class Folder(db.Model):
|
||||
__tablename__ = "folders"
|
||||
|
||||
@@ -141,6 +247,7 @@ class Photo(db.Model):
|
||||
mime_type = db.Column(db.String(100), nullable=False, default="image/jpeg")
|
||||
user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=True, index=True)
|
||||
folder_id = db.Column(db.Integer, db.ForeignKey("folders.id"), nullable=True, index=True)
|
||||
storage_backend = db.Column(db.String(20), nullable=False, default="local")
|
||||
created_at = db.Column(
|
||||
db.DateTime,
|
||||
nullable=False,
|
||||
@@ -149,6 +256,11 @@ class Photo(db.Model):
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
from app.settings_service import get_settings
|
||||
|
||||
settings = get_settings()
|
||||
if self.storage_backend == "s3" and settings.s3_public_url:
|
||||
return f"{settings.s3_public_url.rstrip('/')}/{self.filename}"
|
||||
return f"/uploads/{self.filename}"
|
||||
|
||||
@property
|
||||
|
||||
Reference in New Issue
Block a user