wip

app/models.py

@@ -5,41 +5,61 @@ from app import db, login_manager
 import uuid
 
 @login_manager.user_loader
-def load_user(user_id):
-    return User.query.get(int(user_id))
+def load_user(id):
+    return User.query.get(int(id))
 
 class User(UserMixin, db.Model):
+    __tablename__ = 'user'
+    
     id = db.Column(db.Integer, primary_key=True)
-    username = db.Column(db.String(64), unique=True, index=True)
+    username = db.Column(db.String(64), index=True, unique=True)
+    email = db.Column(db.String(120), index=True, unique=True)
     password_hash = db.Column(db.String(128))
-    files = db.relationship('File', backref='owner', lazy='dynamic')
-    shares = db.relationship('Share', backref='creator', lazy='dynamic')
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)
+    last_login = db.Column(db.DateTime)
+    
+    # Relationships
+    files = db.relationship('File', backref='owner', lazy='dynamic', 
+                           foreign_keys='File.user_id', cascade='all, delete-orphan')
+    
+    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'
+    
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(255))
-    storage_name = db.Column(db.String(255))  # Added field for UUID-based storage
-    mime_type = db.Column(db.String(128))
-    size = db.Column(db.Integer, default=0)
+    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)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
-    parent_id = db.Column(db.Integer, db.ForeignKey('file.id'))
     
-    # Add relationship to represent folder structure
-    children = db.relationship('File', 
-                               backref=db.backref('parent', remote_side=[id]),
-                               lazy='dynamic')
+    # Relationships
+    children = db.relationship('File', backref=db.backref('parent', remote_side=[id]),
+                              lazy='dynamic', cascade='all, delete-orphan')
     
-    # Add relationship for shared files
-    shares = db.relationship('Share', backref='file', lazy='dynamic')
+    def __repr__(self):
+        return f'<File {self.name} {"(Folder)" if self.is_folder else ""}>'
+    
+    def generate_storage_name(self):
+        """Generate a unique name for file storage to prevent conflicts"""
+        if self.is_folder:
+            return None
+        
+        # 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}"
 
 class Share(db.Model):
     id = db.Column(db.Integer, primary_key=True)