fix: #420 internal epub font; chore: comment clean

Author: mienaiyami

src/common/types/legacy.ts

@@ -23,7 +23,6 @@ type BookItem = {
     title: string;
     author: string;
     link: string;
-    //todo impl
     cover: string;
     date?: string;
     chapterData?: {

src/electron/db/index.ts

@@ -9,10 +9,16 @@ import { libraryItems, mangaProgress, bookProgress, mangaBookmarks, bookBookmark
 import { HistoryItem, Manga_BookItem } from "@common/types/legacy";
 import Database from "better-sqlite3";
 import { dateFromOldDateString, electronOnly, log } from "../util";
-import { AddToLibraryData, UpdateBookProgressData, UpdateMangaProgressData } from "@common/types/db";
+import {
+    AddToLibraryData,
+    BookProgress,
+    LibraryItem,
+    MangaProgress,
+    UpdateBookProgressData,
+    UpdateMangaProgressData,
+} from "@common/types/db";
 
 electronOnly();
-// todo : add proper error handling
 
 export const DB_PATH = app.isPackaged ? path.join(app.getPath("userData"), "data.db") : "data.db";
 
@@ -23,17 +29,17 @@ export class DatabaseService {
         this._db = drizzle({ client: sqlite, schema });
     }
 
-    get db() {
+    get db(): ReturnType<typeof drizzle> {
         return this._db;
     }
-    async initialize() {
+    async initialize(): Promise<void> {
         console.log("Migrating database");
-        migrate(this._db, {
+        await migrate(this._db, {
             migrationsFolder: app.isPackaged ? path.join(path.dirname(app.getAppPath()), "drizzle") : "drizzle",
         });
         console.log(this._db.all(`select unixepoch() as time`));
     }
-    async addLibraryItem(data: AddToLibraryData) {
+    async addLibraryItem(data: AddToLibraryData): Promise<LibraryItem> {
         return await this._db.transaction(async (tx) => {
             const [item] = await tx.insert(libraryItems).values(data.data).returning();
             if (data.type === "manga") {
@@ -54,7 +60,7 @@ export class DatabaseService {
         });
     }
 
-    async updateMangaProgress(data: UpdateMangaProgressData) {
+    async updateMangaProgress(data: UpdateMangaProgressData): Promise<MangaProgress[]> {
         const { itemLink, ...updateData } = data;
         return await this._db
             .update(mangaProgress)
@@ -66,7 +72,7 @@ export class DatabaseService {
             .returning();
     }
 
-    async updateMangaChapterRead(itemLink: string, chapterNames: string[], read: boolean) {
+    async updateMangaChapterRead(itemLink: string, chapterNames: string[], read: boolean): Promise<string[]> {
         return await this._db.transaction(async (tx) => {
             const [progress] = await tx.select().from(mangaProgress).where(eq(mangaProgress.itemLink, itemLink));
             if (!progress) {
@@ -89,7 +95,7 @@ export class DatabaseService {
         });
     }
 
-    async updateBookProgress(data: UpdateBookProgressData) {
+    async updateBookProgress(data: UpdateBookProgressData): Promise<BookProgress[]> {
         const { itemLink, ...updateData } = data;
         return await this._db
             .update(bookProgress)
@@ -101,9 +107,7 @@ export class DatabaseService {
             .returning();
     }
 
-    // todo: review
-    // todo: add option in frontend to manually import as well
-    async migrateFromJSON(historyData: HistoryItem[], bookmarkData: Manga_BookItem[]) {
+    async migrateFromJSON(historyData: HistoryItem[], bookmarkData: Manga_BookItem[]): Promise<void> {
         log.log(
             "Migrating from JSON " +
                 historyData.length +

src/electron/db/schema.ts

@@ -1,8 +1,6 @@
 import { relations, sql } from "drizzle-orm";
 import { sqliteTable, text, integer, unique, index } from "drizzle-orm/sqlite-core";
 
-// todo : add relations
-
 const timeNow = sql`(unixepoch() * 1000)`;
 
 export const libraryItems = sqliteTable("library_items", {

src/electron/main.ts

@@ -85,10 +85,6 @@ app.on("ready", async () => {
                 { role: "forceReload" },
                 { role: "toggleDevTools" },
                 { type: "separator" },
-                // ! moving to App.tsx
-                // { role: "resetZoom" },
-                // { role: "zoomIn", accelerator: "CommandOrControl+=" },
-                // { role: "zoomOut" },
             ],
         },
         {

src/electron/util/migrate.ts

@@ -16,7 +16,7 @@ export const migrateToSqlite = async (
     db: DatabaseService,
     history: HistoryItem[],
     bookmarks: Manga_BookItem[],
-) => {
+): Promise<void> => {
     try {
         log.log("Backing up db");
         await fs.access(DB_PATH);
@@ -37,7 +37,7 @@ export const migrateToSqlite = async (
     }
 };
 
-export const checkForJSONMigration = async (db: DatabaseService) => {
+export const checkForJSONMigration = async (db: DatabaseService): Promise<void> => {
     const bookmarks: Manga_BookItem[] = [];
     const history: HistoryItem[] = [];
     try {

src/renderer/components/ListNavigator.tsx

@@ -224,12 +224,12 @@ type SearchInputProps = {
       }
 );
 
-const SearchInputComponent = ({
+const SearchInputComponent: React.FC<SearchInputProps> = ({
     placeholder = "Type to search",
     className = "search-input",
     onChange,
     runOriginalOnChange = false,
-}: SearchInputProps) => {
+}) => {
     const { inputRef, handleFilterChange, handleKeyDown, setFocused } = useListNavigator();
 
     useEffect(() => {

src/renderer/components/ui/MenuList.tsx

@@ -9,7 +9,7 @@ import { shallowEqual } from "react-redux";
 
 // ! not indented to be used without `AppContext::optSelectData`
 //todo rename later for select only
-const MenuList = () => {
+const MenuList: React.FC = () => {
     const { optSelectData } = useAppContext();
     const shortcutsMapped = useAppSelector(getShortcutsMapped, shallowEqual);
 

src/renderer/components/ui/Modal.tsx

@@ -9,7 +9,6 @@ type PropsBase = {
 type Props1 = PropsBase & { children: ReactNode; asHTML?: false };
 type Props2 = PropsBase & { children: string; asHTML: true };
 const Modal = memo((props: Props1 | Props2) => {
-    //todo impl
     return (
         <FocusLock disabled={!!props.noFocusLock}>
             <div

src/renderer/features/reader/epub/StyleSheets.tsx

@@ -8,21 +8,21 @@ const StyleSheets = memo(
                 className="stylesheets"
                 ref={(node) => {
                     if (node) {
-                        // todo check async behavior
                         sheets.forEach(async (url) => {
                             try {
                                 const stylesheet = document.createElement("style");
                                 let txt = await window.fs.readFile(url, "utf-8");
                                 const matches = Array.from(txt.matchAll(/url\((.*?)\);/gi));
                                 matches.forEach((e) => {
                                     // for font
-                                    const url_old = e[1].slice(1, -1);
+                                    let originalURL = e[1];
+                                    if (originalURL.startsWith(`'`) || originalURL.startsWith(`"`))
+                                        originalURL = originalURL.slice(1, -1);
                                     txt = txt.replaceAll(
-                                        url_old,
-                                        "file://" +
-                                            window.path
-                                                .join(window.path.dirname(url), url_old)
-                                                .replaceAll("\\", "/"),
+                                        e[1],
+                                        `"file://${window.path
+                                            .join(window.path.dirname(url), originalURL)
+                                            .replaceAll("\\", "/")}"`,
                                     );
                                 });
                                 // to make sure styles don't apply outside
@@ -49,5 +49,6 @@ const StyleSheets = memo(
     },
     (prev, next) => prev.sheets.length === next.sheets.length && prev.sheets[0] === next.sheets[0],
 );
+StyleSheets.displayName = "StyleSheets";
 
 export default StyleSheets;

src/renderer/store/shortcuts.ts

@@ -65,8 +65,6 @@ const shortcuts = createSlice({
     initialState,
     reducers: {
         setShortcuts: (state, action: PayloadAction<{ command: ShortcutCommands; key: string }>) => {
-            // todo: why did i do this?
-            // if (action.payload instanceof Array) state = action.payload;
             const { command, key } = action.payload;
             const index = state.findIndex((e) => e.command === command);
             if (index > -1) {