kinda working safe point
This commit is contained in:
pika
parent
b9a82af12f
commit
6dda02141e
31 changed files with 4302 additions and 2937 deletions
204
app/models.py
204
app/models.py
|
|
@ -1,109 +1,181 @@
|
|||
from datetime import datetime
|
||||
import logging
|
||||
from werkzeug.security import generate_password_hash, check_password_hash
|
||||
from flask_login import UserMixin
|
||||
from app import db, login_manager
|
||||
import uuid
|
||||
import os
|
||||
import mimetypes
|
||||
|
||||
# Add debug logging
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.info("Loading models.py module")
|
||||
|
||||
@login_manager.user_loader
|
||||
def load_user(id):
|
||||
return User.query.get(int(id))
|
||||
|
||||
class User(UserMixin, db.Model):
|
||||
__tablename__ = 'user'
|
||||
__tablename__ = 'users'
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
username = db.Column(db.String(64), index=True, unique=True)
|
||||
email = db.Column(db.String(120), index=True, unique=True)
|
||||
username = db.Column(db.String(64), unique=True, index=True)
|
||||
email = db.Column(db.String(120), unique=True, index=True)
|
||||
password_hash = db.Column(db.String(128))
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
last_login = db.Column(db.DateTime)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
is_admin = db.Column(db.Boolean, default=False)
|
||||
|
||||
# Relationships
|
||||
files = db.relationship('File', backref='owner', lazy='dynamic',
|
||||
foreign_keys='File.user_id', cascade='all, delete-orphan')
|
||||
shares = db.relationship('Share', backref='owner', lazy='dynamic',
|
||||
foreign_keys='Share.user_id', cascade='all, delete-orphan')
|
||||
downloads = db.relationship('Download', backref='user', lazy='dynamic',
|
||||
foreign_keys='Download.user_id', cascade='all, delete-orphan')
|
||||
# Define relationships without circular backrefs
|
||||
folders = db.relationship('Folder', foreign_keys='Folder.user_id',
|
||||
backref=db.backref('owner', lazy='joined'),
|
||||
lazy='dynamic', cascade="all, delete-orphan")
|
||||
|
||||
files = db.relationship('File', foreign_keys='File.user_id',
|
||||
backref=db.backref('owner', lazy='joined'),
|
||||
lazy='dynamic', cascade="all, delete-orphan")
|
||||
|
||||
downloads = db.relationship('Download', foreign_keys='Download.user_id',
|
||||
backref=db.backref('downloader', lazy='joined'),
|
||||
lazy='dynamic', cascade="all, delete-orphan")
|
||||
|
||||
# Add shares relationship for consistency with existing database
|
||||
shares_created = db.relationship('Share', foreign_keys='Share.user_id',
|
||||
backref=db.backref('creator', lazy='joined'),
|
||||
lazy='dynamic', cascade="all, delete-orphan")
|
||||
|
||||
@property
|
||||
def password(self):
|
||||
raise AttributeError('password is not a readable attribute')
|
||||
|
||||
@password.setter
|
||||
def password(self, password):
|
||||
self.password_hash = generate_password_hash(password)
|
||||
logger.info(f"Password set for user {self.username}")
|
||||
|
||||
# Add set_password method for compatibility with existing code
|
||||
def set_password(self, password):
|
||||
"""Set user password - compatibility method"""
|
||||
logger.info(f"set_password called for {self.username}")
|
||||
self.password_hash = generate_password_hash(password)
|
||||
|
||||
def verify_password(self, password):
|
||||
return check_password_hash(self.password_hash, password)
|
||||
|
||||
def __repr__(self):
|
||||
return f'<User {self.username}>'
|
||||
|
||||
def set_password(self, password):
|
||||
self.password_hash = generate_password_hash(password)
|
||||
|
||||
def check_password(self, password):
|
||||
return check_password_hash(self.password_hash, password)
|
||||
|
||||
class File(db.Model):
|
||||
__tablename__ = 'file'
|
||||
# Log that the User class is defined
|
||||
logger.info("User class defined with set_password method")
|
||||
|
||||
class Folder(db.Model):
|
||||
__tablename__ = 'folders'
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
name = db.Column(db.String(255), nullable=False)
|
||||
storage_name = db.Column(db.String(255)) # Used for storing files with unique names
|
||||
is_folder = db.Column(db.Boolean, default=False)
|
||||
mime_type = db.Column(db.String(128))
|
||||
size = db.Column(db.Integer, default=0) # Size in bytes
|
||||
parent_id = db.Column(db.Integer, db.ForeignKey('file.id', ondelete='CASCADE'), nullable=True)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
|
||||
parent_id = db.Column(db.Integer, db.ForeignKey('folders.id'))
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
children = db.relationship('File', backref=db.backref('parent', remote_side=[id]),
|
||||
lazy='dynamic', cascade='all, delete-orphan')
|
||||
shares = db.relationship('Share', backref='file', lazy='dynamic', cascade='all, delete-orphan')
|
||||
downloads = db.relationship('Download', backref='file', lazy='dynamic', cascade='all, delete-orphan')
|
||||
# Define relationship to parent folder with proper backref
|
||||
parent = db.relationship('Folder', remote_side=[id],
|
||||
backref=db.backref('children', lazy='dynamic'))
|
||||
|
||||
# Define relationship to files in this folder
|
||||
files = db.relationship('File', foreign_keys='File.folder_id',
|
||||
backref=db.backref('folder', lazy='joined'),
|
||||
lazy='dynamic', cascade="all, delete-orphan")
|
||||
|
||||
def get_path(self):
|
||||
"""Get the full path of the folder"""
|
||||
if self.parent is None:
|
||||
return "/" + self.name
|
||||
return self.parent.get_path() + "/" + self.name
|
||||
|
||||
def __repr__(self):
|
||||
return f'<File {self.name} {"(Folder)" if self.is_folder else ""}>'
|
||||
return f'<Folder {self.name}>'
|
||||
|
||||
class File(db.Model):
|
||||
__tablename__ = 'files'
|
||||
|
||||
def generate_storage_name(self):
|
||||
"""Generate a unique name for file storage to prevent conflicts"""
|
||||
if self.is_folder:
|
||||
return None
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
name = db.Column(db.String(255), nullable=False)
|
||||
original_name = db.Column(db.String(255), nullable=False)
|
||||
path = db.Column(db.String(255), nullable=False)
|
||||
size = db.Column(db.Integer, nullable=False)
|
||||
type = db.Column(db.String(128))
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
|
||||
folder_id = db.Column(db.Integer, db.ForeignKey('folders.id'))
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
|
||||
# Define relationships
|
||||
shares = db.relationship('Share', backref='file', lazy='dynamic')
|
||||
|
||||
@property
|
||||
def icon_class(self):
|
||||
"""Get the appropriate Font Awesome icon class based on file extension"""
|
||||
extension = os.path.splitext(self.name)[1].lower()
|
||||
|
||||
# Generate a unique filename using UUID
|
||||
ext = self.name.rsplit('.', 1)[1].lower() if '.' in self.name else ''
|
||||
return f"{uuid.uuid4().hex}.{ext}" if ext else f"{uuid.uuid4().hex}"
|
||||
# Map extensions to icon classes
|
||||
icon_map = {
|
||||
'.pdf': 'fa-file-pdf',
|
||||
'.doc': 'fa-file-word', '.docx': 'fa-file-word',
|
||||
'.xls': 'fa-file-excel', '.xlsx': 'fa-file-excel',
|
||||
'.ppt': 'fa-file-powerpoint', '.pptx': 'fa-file-powerpoint',
|
||||
'.jpg': 'fa-file-image', '.jpeg': 'fa-file-image', '.png': 'fa-file-image',
|
||||
'.gif': 'fa-file-image', '.svg': 'fa-file-image',
|
||||
'.mp3': 'fa-file-audio', '.wav': 'fa-file-audio', '.ogg': 'fa-file-audio',
|
||||
'.mp4': 'fa-file-video', '.avi': 'fa-file-video', '.mov': 'fa-file-video',
|
||||
'.zip': 'fa-file-archive', '.rar': 'fa-file-archive', '.tar': 'fa-file-archive',
|
||||
'.gz': 'fa-file-archive',
|
||||
'.txt': 'fa-file-alt', '.md': 'fa-file-alt',
|
||||
'.html': 'fa-file-code', '.css': 'fa-file-code', '.js': 'fa-file-code',
|
||||
'.py': 'fa-file-code', '.java': 'fa-file-code', '.c': 'fa-file-code'
|
||||
}
|
||||
|
||||
return icon_map.get(extension, 'fa-file')
|
||||
|
||||
def get_mime_type(self):
|
||||
"""Get the MIME type based on the file extension"""
|
||||
mime_type, _ = mimetypes.guess_type(self.name)
|
||||
return mime_type or 'application/octet-stream'
|
||||
|
||||
def __repr__(self):
|
||||
return f'<File {self.name}>'
|
||||
|
||||
class Share(db.Model):
|
||||
__tablename__ = 'share'
|
||||
__tablename__ = 'shares'
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
file_id = db.Column(db.Integer, db.ForeignKey('file.id', ondelete='CASCADE'), nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
|
||||
share_token = db.Column(db.String(64), unique=True)
|
||||
is_public = db.Column(db.Boolean, default=False)
|
||||
is_password_protected = db.Column(db.Boolean, default=False)
|
||||
password_hash = db.Column(db.String(128))
|
||||
expiry_date = db.Column(db.DateTime, nullable=True)
|
||||
file_id = db.Column(db.Integer, db.ForeignKey('files.id'), nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
|
||||
access_key = db.Column(db.String(64), unique=True, index=True, nullable=False)
|
||||
expires_at = db.Column(db.DateTime, nullable=True)
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
download_count = db.Column(db.Integer, default=0)
|
||||
|
||||
def is_expired(self):
|
||||
"""Check if the share has expired"""
|
||||
if self.expires_at is None:
|
||||
return False
|
||||
return datetime.utcnow() > self.expires_at
|
||||
|
||||
def __repr__(self):
|
||||
return f'<Share {self.share_token}>'
|
||||
|
||||
def set_password(self, password):
|
||||
self.password_hash = generate_password_hash(password)
|
||||
self.is_password_protected = True
|
||||
|
||||
def check_password(self, password):
|
||||
return check_password_hash(self.password_hash, password)
|
||||
|
||||
def generate_token(self):
|
||||
"""Generate a unique token for sharing"""
|
||||
return uuid.uuid4().hex
|
||||
return f'<Share {self.access_key}>'
|
||||
|
||||
class Download(db.Model):
|
||||
__tablename__ = 'download'
|
||||
__tablename__ = 'downloads'
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
file_id = db.Column(db.Integer, db.ForeignKey('file.id', ondelete='CASCADE'), nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=True) # Nullable for anonymous downloads
|
||||
ip_address = db.Column(db.String(64))
|
||||
user_agent = db.Column(db.String(255))
|
||||
share_id = db.Column(db.Integer, db.ForeignKey('share.id', ondelete='SET NULL'), nullable=True)
|
||||
downloaded_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
file_id = db.Column(db.Integer, db.ForeignKey('files.id'), nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
|
||||
download_date = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
|
||||
# Define relationship to file
|
||||
file = db.relationship('File', foreign_keys=[file_id],
|
||||
backref=db.backref('file_downloads', lazy='dynamic'))
|
||||
|
||||
def __repr__(self):
|
||||
return f'<Download of File {self.file_id} at {self.downloaded_at}>'
|
||||
return f'<Download {self.id} by {self.user_id}>'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue