Update database.py

database.py

@@ -1,50 +1,90 @@
 import os
 import sqlite3
 from flask import g
+from pathlib import Path
 
 class Database:
     def __init__(self, db_url):
+        # Ensure the database directory exists
+        db_path = self._parse_db_url(db_url)
+        Path(db_path).parent.mkdir(parents=True, exist_ok=True)
+        
         self.db_url = db_url
         self.conn = None
 
+    def _parse_db_url(self, db_url):
+        """Extract the file path from SQLite URL"""
+        if db_url.startswith('sqlite:///'):
+            return db_url[10:]  # Remove 'sqlite:///'
+        return db_url
+
     def get_db(self):
         if not self.conn:
-            self.conn = sqlite3.connect(self.db_url)
-            self.conn.row_factory = sqlite3.Row
+            try:
+                self.conn = sqlite3.connect(self._parse_db_url(self.db_url))
+                self.conn.row_factory = sqlite3.Row
+                # Enable foreign key support
+                self.conn.execute("PRAGMA foreign_keys = ON")
+            except sqlite3.Error as e:
+                print(f"Error connecting to database: {e}")
+                raise
         return self.conn
 
     def close_db(self):
         if self.conn:
-            self.conn.close()
-            self.conn = None
+            try:
+                self.conn.close()
+            except sqlite3.Error as e:
+                print(f"Error closing database: {e}")
+            finally:
+                self.conn = None
 
     def init_db(self):
         db = self.get_db()
-        with open('schema.sql', 'r') as f:
-            db.cursor().executescript(f.read())
-        db.commit()
+        try:
+            # Check if schema.sql exists in the correct path
+            schema_path = os.path.join(os.path.dirname(__file__), 'schema.sql')
+            if not os.path.exists(schema_path):
+                raise FileNotFoundError(f"Schema file not found at {schema_path}")
+                
+            with open(schema_path, 'r') as f:
+                db.cursor().executescript(f.read())
+            db.commit()
+        except Exception as e:
+            print(f"Error initializing database: {e}")
+            raise
 
     def cache_news(self, articles):
         db = self.get_db()
-        for article in articles:
-            try:
+        try:
+            for article in articles:
                 db.execute('''
                     INSERT OR IGNORE INTO news 
                     (title, source, published, url, summary, content)
                     VALUES (?,?,?,?,?,?)
                 ''', (
-                    article['title'],
-                    article['source'],
-                    article['published'],
-                    article['url'],
-                    article['summary'],
-                    article['content']
+                    article.get('title', ''),
+                    article.get('source', ''),
+                    article.get('published', ''),
+                    article.get('url', ''),
+                    article.get('summary', ''),
+                    article.get('content', '')
                 ))
-            except sqlite3.IntegrityError:
-                continue
-        db.commit()
+            db.commit()
+        except sqlite3.Error as e:
+            print(f"Error caching news: {e}")
+            db.rollback()
+            raise
 
     def get_cached_news(self):
         db = self.get_db()
-        cur = db.execute('SELECT * FROM news ORDER BY timestamp DESC LIMIT 15')
-        return [dict(row) for row in cur.fetchall()]
+        try:
+            cur = db.execute('''
+                SELECT * FROM news 
+                ORDER BY published DESC 
+                LIMIT 15
+            ''')
+            return [dict(row) for row in cur.fetchall()]
+        except sqlite3.Error as e:
+            print(f"Error fetching cached news: {e}")
+            raise