chore: move db functions to db.ts

jacob-shuman · Sep 6, 2024 · 1c40989 · 1c40989
1 parent 8251a36
commit 1c40989
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 41 deletions.
diff --git a/src/lib/db.ts b/src/lib/db.ts
@@ -0,0 +1,32 @@
+import BetterSqlite3 from 'better-sqlite3';
+import { mkdirSync } from 'node:fs';
+import type { FeedItem } from './feed';
+
+export function recreateDb(): BetterSqlite3.Database {
+	mkdirSync('./data', { recursive: true });
+
+	const db = BetterSqlite3('data/local.sqlite');
+
+	return db.exec(
+		`
+        CREATE TABLE IF NOT EXISTS articles (
+          id INTEGER PRIMARY KEY AUTOINCREMENT,
+          url TEXT NOT NULL,
+		  title TEXT,
+		  description TEXT,
+		  content TEXT,
+		  author TEXT,
+		  date TEXT,
+		  favicon TEXT
+        )
+      `
+	);
+}
+
+export function getArticles(): FeedItem[] {
+	const db = recreateDb();
+
+	const articles = db.prepare('SELECT * FROM articles').all() as FeedItem[];
+
+	return articles;
+}
diff --git a/src/lib/feed.ts b/src/lib/feed.ts
@@ -1,8 +1,6 @@
 import { env } from '$env/dynamic/private';
 import { type ArticleData } from '@extractus/article-extractor';
-import BetterSqlite3 from 'better-sqlite3';
 import { Feed } from 'feed';
-import { mkdirSync } from 'node:fs';
 
 export interface FeedItem {
 	id: number;
@@ -17,27 +15,6 @@ export interface FeedItem {
 
 const baseUrl = `${env.SECURE ? 'https' : 'http'}://${env.HOST}:${env.PORT}`;
 
-export function recreateDb(): BetterSqlite3.Database {
-	mkdirSync('./data', { recursive: true });
-
-	const db = BetterSqlite3('data/local.sqlite');
-
-	return db.exec(
-		`
-        CREATE TABLE IF NOT EXISTS articles (
-          id INTEGER PRIMARY KEY AUTOINCREMENT,
-          url TEXT NOT NULL,
-		  title TEXT,
-		  description TEXT,
-		  content TEXT,
-		  author TEXT,
-		  date TEXT,
-		  favicon TEXT
-        )
-      `
-	);
-}
-
 export function generateFeed(items: FeedItem[]): Feed {
 	const feed = new Feed({
 		title: env.FEED_TITLE ?? 'readl8r',
@@ -76,14 +53,6 @@ export function generateFeed(items: FeedItem[]): Feed {
 	return feed;
 }
 
-export function getArticles(): FeedItem[] {
-	const db = recreateDb();
-
-	const articles = db.prepare('SELECT * FROM articles').all() as unknown as FeedItem[];
-
-	return articles;
-}
-
 const adjectives: string[] = [
 	// goofy
 	'Witty',

diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
@@ -1,5 +1,6 @@
 import { env } from '$env/dynamic/private';
-import { generateFeedDescription, generateFeedTitle, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeedDescription, generateFeedTitle } from '$lib/feed';
 import type { LayoutServerLoad } from './$types';
 
 export const load: LayoutServerLoad = async () => ({

diff --git a/src/routes/articles/+server.ts b/src/routes/articles/+server.ts
@@ -1,4 +1,4 @@
-import { getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () =>

diff --git a/src/routes/articles/add/+server.ts b/src/routes/articles/add/+server.ts
@@ -1,5 +1,5 @@
 import { isAuthorized } from '$lib/auth';
-import { recreateDb } from '$lib/feed';
+import { recreateDb } from '$lib/db';
 import { extract } from '@extractus/article-extractor';
 import { type RequestHandler } from '@sveltejs/kit';
 

diff --git a/src/routes/articles/clear/+server.ts b/src/routes/articles/clear/+server.ts
@@ -1,5 +1,5 @@
 import { isAuthorized } from '$lib/auth';
-import { recreateDb } from '$lib/feed';
+import { recreateDb } from '$lib/db';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const POST: RequestHandler = async ({ request }) => {

diff --git a/src/routes/atom/+server.ts b/src/routes/atom/+server.ts
@@ -1,4 +1,5 @@
-import { generateFeed, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeed } from '$lib/feed';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () => {

diff --git a/src/routes/feed.xml/+server.ts b/src/routes/feed.xml/+server.ts
@@ -1,4 +1,5 @@
-import { generateFeed, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeed } from '$lib/feed';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () => {

diff --git a/src/routes/feed/+server.ts b/src/routes/feed/+server.ts
@@ -1,4 +1,5 @@
-import { generateFeed, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeed } from '$lib/feed';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () => {

diff --git a/src/routes/json/+server.ts b/src/routes/json/+server.ts
@@ -1,4 +1,5 @@
-import { generateFeed, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeed } from '$lib/feed';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () => {

diff --git a/src/routes/rss.xml/+server.ts b/src/routes/rss.xml/+server.ts
@@ -1,4 +1,5 @@
-import { generateFeed, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeed } from '$lib/feed';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () => {

diff --git a/src/routes/rss/+server.ts b/src/routes/rss/+server.ts
@@ -1,4 +1,5 @@
-import { generateFeed, getArticles } from '$lib/feed';
+import { getArticles } from '$lib/db';
+import { generateFeed } from '$lib/feed';
 import { type RequestHandler } from '@sveltejs/kit';
 
 export const GET: RequestHandler = async () => {