work on downloading some more.

__mocks__/db.ts

@@ -1,7 +1,8 @@
 export default {
   getDb: jest.fn(() => {
     return {
-      runAsync: jest.fn((statement: string, value: string) => {}),
+      runAsync: jest.fn((statement: string, ... values: string []) => {}),
+      runSync: jest.fn((statement: string, ... values : string []) => {}),
       getFirstAsync: jest.fn((statement: string, value: string) => {
         return [];
       }),

app/i18n/api.ts

@@ -1,123 +1,155 @@
 import { Cache } from "react-native-cache";
 import { LIBRETRANSLATE_BASE_URL } from "@/constants/api";
-import AsyncStorage from '@react-native-async-storage/async-storage';
+import AsyncStorage from "@react-native-async-storage/async-storage";
 import { Settings } from "../lib/settings";
 
 type language_t = string;
 
 const cache = new Cache({
-    namespace: "translation_terrace",
+  namespace: "translation_terrace",
-    policy: {
+  policy: {
-        maxEntries: 50000, // if unspecified, it can have unlimited entries
+    maxEntries: 50000, // if unspecified, it can have unlimited entries
-        stdTTL: 0 // the standard ttl as number in seconds, default: 0 (unlimited)
+    stdTTL: 0, // the standard ttl as number in seconds, default: 0 (unlimited)
-    },
+  },
-    backend: AsyncStorage
+  backend: AsyncStorage,
 });
 
 export type language_matrix_entry = {
-    code: string,
+  code: string;
-    name: string,
+  name: string;
-    targets: string []
+  targets: string[];
-}
+};
 
 export type language_matrix = {
-    [key:string] : language_matrix_entry
+  [key: string]: language_matrix_entry;
-}
+};
 
-export async function fetchWithTimeout(url : string, options : RequestInit, timeout = 5000) : Promise<Response> {
+export async function fetchWithTimeout(
-    return Promise.race([
+  url: string,
-        fetch(url, options),
+  options: RequestInit,
-        new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))
+  timeout = 5000
-    ]);
+): Promise<Response> {
+  return Promise.race([
+    fetch(url, options),
+    new Promise((_, reject) =>
+      setTimeout(() => reject(new Error("timeout")), timeout)
+    ),
+  ]);
 }
 
 export class LanguageServer {
-    constructor(public baseUrl : string) {}
+  constructor(public baseUrl: string) {}
 
-    async fetchLanguages(timeout = 500) : Promise<language_matrix> {
+  async fetchLanguages(timeout = 500): Promise<language_matrix> {
-        let data  = {};
+    let data = {};
-        const res = await fetchWithTimeout(this.baseUrl + "/languages", {
+    const res = await fetchWithTimeout(
-            headers: {
+      this.baseUrl + "/languages",
-                "Content-Type": "application/json"
+      {
-            }
+        headers: {
-        }, timeout);
+          "Content-Type": "application/json",
-        try {
+        },
-            data = await res.json();
+      },
-        } catch (e) {
+      timeout
-            throw new Error(`Parsing data from ${await res.text()}: ${e}`)
+    );
-        }
+    try {
-        try {
+      data = await res.json();
-            return Object.fromEntries(
+    } catch (e) {
-                Object.values(data as language_matrix_entry []).map((obj : language_matrix_entry) => {
+      throw new Error(`Parsing data from ${await res.text()}: ${e}`);
-                    return [
-                        obj["code"],
-                        obj,
-                    ]
-                })
-            )
-        } catch(e) {
-            throw new Error(`Can't extract values from data: ${JSON.stringify(data)}`)
-        }
     }
+    try {
+      return Object.fromEntries(
+        Object.values(data as language_matrix_entry[]).map(
+          (obj: language_matrix_entry) => {
+            return [obj["code"], obj];
+          }
+        )
+      );
+    } catch (e) {
+      throw new Error(
+        `Can't extract values from data: ${JSON.stringify(data)}`
+      );
+    }
+  }
 
-    static async getDefault() {
+  static async getDefault() {
-        const settings = await Settings.getDefault();
+    const settings = await Settings.getDefault();
-        return new LanguageServer(await settings.getLibretranslateBaseUrl() || LIBRETRANSLATE_BASE_URL);
+    return new LanguageServer(
-    }
+      (await settings.getLibretranslateBaseUrl()) || LIBRETRANSLATE_BASE_URL
+    );
+  }
 }
 
 export class Translator {
-    constructor(public source : language_t, public defaultTarget : string = "en", private _languageServer : LanguageServer) {
+  constructor(
-    }
+    public source: language_t,
+    public defaultTarget: string = "en",
+    private _languageServer: LanguageServer
+  ) {}
 
-    get languageServer() {
+  get languageServer() {
-        return this._languageServer;
+    return this._languageServer;
-    }
+  }
 
-    async translate(text : string, target : string|undefined = undefined) {
+  async translate(text: string, target: string | undefined = undefined) {
-        const url = this._languageServer.baseUrl + `/translate`;
+    const url = this._languageServer.baseUrl + `/translate`;
-        const res = await fetch(url, {
+    console.log(url);
-            method: "POST",
+    const postData = {
-            body: JSON.stringify({
+      method: "POST",
-                q: text,
+      body: JSON.stringify({
-                source: this.source,
+        q: text,
-                target: target || this.defaultTarget,
+        source: this.source,
-                format: "text",
+        target: target || this.defaultTarget,
-                alternatives: 3,
+        format: "text",
-                api_key: ""
+        alternatives: 3,
-            }),
+        api_key: "",
-            headers: { "Content-Type": "application/json" }
+      }),
-        });
+      headers: { "Content-Type": "application/json" },
+    };
 
-        
+    console.debug("Requesting %s with %o", url, postData);
-        const data = await res.json();
-        console.log(data)
-        return data.translatedText
-    }
 
-    static async getDefault(defaultTarget: string | undefined = undefined) {
+    const res = await fetch(url, postData);
-        const settings = await Settings.getDefault();
+
-        const source = await settings.getHostLanguage();
+    const data = await res.json();
-        return new Translator(source, defaultTarget, await LanguageServer.getDefault())
+    if (res.status === 200) {
+      console.log(data);
+      return data.translatedText;
+    } else {
+      console.error(data);
     }
+  }
+
+  static async getDefault(defaultTarget: string | undefined = undefined) {
+    const settings = await Settings.getDefault();
+    const source = await settings.getHostLanguage();
+    return new Translator(
+      source,
+      defaultTarget,
+      await LanguageServer.getDefault()
+    );
+  }
 }
 
 export class CachedTranslator extends Translator {
-    async translate (text : string, target : string|undefined = undefined) {
+  async translate(text: string, target: string | undefined = undefined) {
-        const targetKey = target || this.defaultTarget;
+    const targetKey = target || this.defaultTarget;
-        // console.debug(`Translating from ${this.source} -> ${targetKey}`)
+    // console.debug(`Translating from ${this.source} -> ${targetKey}`)
-        const key1 = `${this.source}::${targetKey}::${text}`
+    const key1 = `${this.source}::${targetKey}::${text}`;
-        const tr1 = await cache.get(key1);
+    const tr1 = await cache.get(key1);
-        if (tr1) return tr1;
+    if (tr1) return tr1;
-        const tr2 = await super.translate(text, target);
+    const tr2 = await super.translate(text, target);
-        const key2 = `${this.source}::${targetKey}::${text}`
+    const key2 = `${this.source}::${targetKey}::${text}`;
-        await cache.set(key2, tr2);
+    await cache.set(key2, tr2);
-        return tr2;
+    return tr2;
-    }
+  }
 
-    static async getDefault(defaultTarget: string | undefined = undefined) {
+  static async getDefault(defaultTarget: string | undefined = undefined) {
-        const settings = await Settings.getDefault();
+    const settings = await Settings.getDefault();
-        const source = await settings.getHostLanguage();
+    const source = await settings.getHostLanguage() || "en";
-        return new CachedTranslator(source, defaultTarget, await LanguageServer.getDefault())
+    return new CachedTranslator(
-    }
+      source,
-}
+      defaultTarget,
+      await LanguageServer.getDefault()
+    );
+  }
+}

app/lib/__tests__/settings.spec.tsx

@@ -1,18 +1,19 @@
 import { Settings } from '@/app/lib/settings';
-import { getDb } from '@/app/lib/db';
+import { getDb, migrateDb } from '@/app/lib/db';
-import { Knex } from 'knex';
+import { SQLiteDatabase } from 'expo-sqlite';
 
 describe('Settings', () => {
-    let settings : Settings;
+    let settings: Settings;
-    let db : Knex;
+    let db: SQLiteDatabase;
 
     beforeEach(async () => {
         db = await getDb("development");
-        settings = new Settings(db)
+        await migrateDb("development");
+        settings = new Settings(db);
     });
 
     afterEach(async () => {
-        await db.migrate.down();
+        await migrateDb("development", "down");
     });
 
     it('should set the host language in the database', async () => {

app/lib/__tests__/whisper.spec.tsx

@@ -1,101 +1,170 @@
-// components/ui/__tests__/WhisperFile.spec.tsx
+// app/lib/__tests__/whisper.spec.tsx
 
 import React from "react";
-import { render, act } from "@testing-library/react-native";
+import { getDb } from "@/app/lib/db";
-import { WhisperFile } from "@/app/lib/whisper"; // Adjust the import path as necessary
+import { WhisperFile, WhisperModelTag } from "@/app/lib/whisper"; // Corrected to use WhisperFile and WhisperModelTag instead of WhisperDownloader
+import { Settings } from "@/app/lib/settings";
+import { File } from "expo-file-system/next";
+jest.mock('expo-file-system');
+import * as FileSystem from 'expo-file-system';
+
+jest.mock("@/app/lib/db", () => ({
+  getDb: jest.fn().mockResolvedValue({
+    runAsync: jest.fn(),
+    upsert: jest.fn(), // Mock the upsert method used in addToDatabase
+  }),
+}));
+
+jest.mock("@/app/lib/settings", () => ({
+  Settings: {
+    getDefault: jest.fn(() => ({
+      getValue: jest.fn((key) => {
+        switch (key) {
+          case "whisper_model":
+            return "base";
+          default:
+            throw new Error(`Invalid setting: '${key}'`);
+        }
+      }),
+    })),
+  },
+}));
+
+
+jest.mock("expo-file-system/next", () => {
+  const _next = jest.requireActual("expo-file-system/next");
+  return {
+    ..._next,
+    File: jest.fn().mockImplementation(() => ({
+      ..._next.File,
+      text: jest.fn(() => {
+        return new String("text");
+      }),
+    })),
+  };
+});
 
 describe("WhisperFile", () => {
+  // Corrected to use WhisperFile instead of WhisperDownloader
   let whisperFile: WhisperFile;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     whisperFile = new WhisperFile("small");
   });
 
-  it("should initialize correctly", () => {
+  it("should create a download resumable with existing data if available", async () => {
-    expect(whisperFile).toBeInstanceOf(WhisperFile);
+    const mockExistingData = "mockExistingData";
+    jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(true);
+
+    await whisperFile.createDownloadResumable();
+    // expect(whisperFile.targetFileName).toEqual("small.bin");
+    expect(whisperFile.targetPath).toContain("small.bin");
+
+    expect(FileSystem.createDownloadResumable).toHaveBeenCalledWith(
+      "https://huggingface.co/openai/whisper-small/resolve/main/pytorch_model.bin",
+      "file:///whisper/small.bin",
+      {},
+      expect.any(Function),
+      expect.anything(),
+    );
   });
 
-  describe("getModelFileSize", () => {
+  // it("should create a download resumable without existing data if not available", async () => {
-    it("should return the correct model file size", async () => {
+  //   jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(false);
-      expect(whisperFile.size).toBeUndefined();
-      await whisperFile.updateMetadata();
-      expect(whisperFile.size).toBeGreaterThan(1000);
-    });
-  });
 
-  describe("getWhisperDownloadStatus", () => {
+  //   await whisperFile.createDownloadResumable(); // Updated to use createDownloadResumable instead of download
-    it("should return the correct download status", async () => {
-      const mockStatus = {
-        doesTargetExist: true,
-        isDownloadComplete: false,
-        hasDownloadStarted: true,
-        progress: {
-          current: 100,
-          total: 200,
-          remaining: 100,
-          percentRemaining: 50.0,
-        },
-      };
-      jest
-        .spyOn(whisperFile, "getDownloadStatus")
-        .mockResolvedValue(mockStatus);
 
-      const result = await whisperFile.getDownloadStatus();
+  //   expect(FileSystem.createDownloadResumable).toHaveBeenCalledWith(
+  //     "http://mock.model.com/model",
+  //     "mockTargetPath",
+  //     {},
+  //     expect.any(Function),
+  //     undefined
+  //   );
+  // });
 
-      expect(result).toEqual(mockStatus);
+  // it("should update the download status in the database", async () => {
-    });
+  //   const mockRunAsync = jest.fn();
-  });
+  //   (getDb as jest.Mock).mockResolvedValue({ runAsync: mockRunAsync });
 
-  describe("initiateWhisperDownload", () => {
+  //   const downloadable = await whisperFile.createDownloadResumable(); // Updated to use createDownloadResumable instead of download
-    it("should initiate the download with default options", async () => {
+  //   await downloadable.resumeAsync();
-      const mockModelLabel = "small";
-      jest
-        .spyOn(whisperFile, "createDownloadResumable")
-        .mockResolvedValue(true);
 
-      await whisperFile.initiateWhisperDownload(mockModelLabel);
+  //   jest.advanceTimersByTime(1000);
 
-      expect(whisperFile.createDownloadResumable).toHaveBeenCalledWith(
+  //   expect(mockRunAsync).toHaveBeenCalled();
-        mockModelLabel
+  // });
-      );
-    });
 
-    it("should initiate the download with custom options", async () => {
+  // it("should record the latest target hash after downloading", async () => {
-      const mockModelLabel = "small";
+  //   const mockRecordLatestTargetHash = jest.spyOn(
-      const mockOptions = { force_redownload: true };
+  //     whisperFile,
-      jest
+  //     "recordLatestTargetHash"
-        .spyOn(whisperFile, "createDownloadResumable")
+  //   );
-        .mockResolvedValue(true);
 
-      await whisperFile.initiateWhisperDownload(mockModelLabel, mockOptions);
+  //   await whisperFile.createDownloadResumable(); // Updated to use createDownloadResumable instead of download
 
-      expect(whisperFile.createDownloadResumable).toHaveBeenCalledWith(
+  //   expect(mockRecordLatestTargetHash).toHaveBeenCalled();
-        mockModelLabel,
+  // });
-        mockOptions
-      );
-    });
 
-    it("should return the correct download status when target exists and is complete", async () => {
+  // it("should call the onData callback if provided", async () => {
-      jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(true);
+  //   const mockOnData = jest.fn();
-      jest.spyOn(whisperFile, "isDownloadComplete").mockResolvedValue(true);
+  //   const options = { onData: mockOnData };
 
-      expect(await whisperFile.doesTargetExist()).toEqual(true);
+  //   await whisperFile.createDownloadResumable(options); // Updated to use createDownloadResumable instead of download
-      expect(await whisperFile.isDownloadComplete()).toEqual(true);
-    });
 
-    it("should return the correct download status when target does not exist", async () => {
+  //   expect(mockOnData).toHaveBeenCalledWith(expect.any(Object));
-      jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(false);
+  // });
 
-      const result = await whisperFile.getDownloadStatus();
+  // describe("getDownloadStatus", () => {
+  //   it("should return the correct download status when model size is known and download has started", async () => {
+  //     whisperFile.size = 1024;
+  //     jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(true);
+  //     jest.spyOn(whisperFile, "isDownloadComplete").mockResolvedValue(false);
+  //     jest.spyOn(whisperFile, "targetFile").mockReturnValue({
+  //       size: 512,
+  //     });
 
-      expect(result).toEqual({
+  //     const status = await whisperFile.getDownloadStatus();
-        doesTargetExist: false,
-        isDownloadComplete: false,
-        hasDownloadStarted: false,
-        progress: undefined,
-      });
-    });
-  });
 
-  // Add more tests as needed for other methods in WhisperFile
+  //     expect(status).toEqual({
+  //       doesTargetExist: true,
+  //       isDownloadComplete: false,
+  //       hasDownloadStarted: true,
+  //       progress: {
+  //         current: 512,
+  //         total: 1024,
+  //         remaining: 512,
+  //         percentRemaining: 50.0,
+  //       },
+  //     });
+  //   });
+
+  //   it("should return the correct download status when model size is known and download is complete", async () => {
+  //     whisperFile.size = 1024;
+  //     jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(true);
+  //     jest.spyOn(whisperFile, "isDownloadComplete").mockResolvedValue(true);
+
+  //     const status = await whisperFile.getDownloadStatus();
+
+  //     expect(status).toEqual({
+  //       doesTargetExist: true,
+  //       isDownloadComplete: true,
+  //       hasDownloadStarted: false,
+  //       progress: undefined,
+  //     });
+  //   });
+
+  //   it("should return the correct download status when model size is unknown", async () => {
+  //     jest.spyOn(whisperFile, "doesTargetExist").mockResolvedValue(false);
+
+  //     const status = await whisperFile.getDownloadStatus();
+
+  //     expect(status).toEqual({
+  //       doesTargetExist: false,
+  //       isDownloadComplete: false,
+  //       hasDownloadStarted: false,
+  //       progress: undefined,
+  //     });
+  //   });
+  // });
 });

app/lib/db.ts

@@ -1,14 +1,16 @@
 import * as SQLite from "expo-sqlite";
 import { MIGRATE_UP, MIGRATE_DOWN } from "./migrations";
 
-export async function getDb() {
+export type db_mode = "development" | "staging" | "production";
-  return await SQLite.openDatabaseAsync("translation_terrace");
+
+export async function getDb(mode : db_mode = "production") {
+  return await SQLite.openDatabaseAsync(`translation_terrace_${mode}`);
 }
 
 
-export async function migrateDb(direction: "up" | "down" = "up") {
+export async function migrateDb(mode : db_mode = "production", direction: "up" | "down" = "up") {
 
-  const db = await getDb();
+  const db = await getDb(mode);
 
   const m = direction === "up" ? MIGRATE_UP : MIGRATE_DOWN;
 

app/lib/migrations.ts

@@ -2,15 +2,16 @@
 export const MIGRATE_UP = {
     1: [
       `CREATE TABLE IF NOT EXISTS settings (
-              host_language TEXT,
+          key TEXT PRIMARY KEY,
-              libretranslate_base_url TEXT,
+          value TEXT
-              ui_direction INTEGER,
+        )`,
-              whisper_model TEXT
-          )`,
     ],
     2: [
       `CREATE TABLE IF NOT EXISTS whisper_models (
               model TEXT PRIMARY KEY,
+              download_status STRING(255),
+              expected_size INTEGER,
+              last_hash STRING(1024),
               bytes_done INTEGER,
               bytes_total INTEGER
           )`,

app/lib/settings.ts

@@ -1,5 +1,6 @@
+import { SQLiteDatabase } from "expo-sqlite";
 import { getDb } from "./db";
-import { Knex } from "knex";
+import { WhisperFile, whisper_model_tag_t } from "./whisper";
 
 export class Settings {
 
@@ -10,7 +11,7 @@ export class Settings {
         "whisper_model",
     ]
 
-    constructor(public db: Knex) {
+    constructor(public db: SQLiteDatabase) {
 
     }
 
@@ -20,9 +21,9 @@ export class Settings {
             throw new Error(`Invalid setting: '${key}'`)
         }
 
-        const row = await this.db("settings").select(key).limit(1).first();
+        const row: { value: string } | null = this.db.getFirstSync(`SELECT value FROM settings WHERE key = ?`, key)
-        if (!(row && row[key])) return undefined;
+
-        return row[key];
+        return row?.value;
     }
 
 
@@ -32,17 +33,11 @@ export class Settings {
         }
 
         // Check if the key already exists
-        const [exists] = await this.db("settings").select(1).whereNotNull(key).limit(1);
+        this.db.runSync(`INSERT OR REPLACE INTO
-
+            settings
-        if (exists) {
+                (key, value)
-            // Update the existing column
+            VALUES
-            await this.db("settings").update({ [key]: value });
+                (?, ?)`, key, value);
-        } else {
-            // Insert a new value into the specified column
-            const insertData: { [key: string]: any } = {};
-            insertData[key] = value;
-            await this.db("settings").insert(insertData);
-        }
     }
 
     async setHostLanguage(value: string) {
@@ -53,7 +48,7 @@ export class Settings {
         return await this.getValue("host_language")
     }
 
-    async setLibretranslateBaseUrl(value : string) {
+    async setLibretranslateBaseUrl(value: string) {
         await this.setValue("libretranslate_base_url", value)
     }
 
@@ -61,16 +56,15 @@ export class Settings {
         return await this.getValue("libretranslate_base_url")
     }
 
-    async setWhisperModel(value : string) {
+    async setWhisperModel(value: string) {
         await this.setValue("whisper_model", value);
     }
 
     async getWhisperModel() {
-        return await this.getValue("whisper_model");
+        return await this.getValue("whisper_model") as whisper_model_tag_t;
     }
 
     static async getDefault() {
         return new Settings(await getDb())
     }
-
 }

app/lib/util.ts

@@ -0,0 +1,5 @@
+import { TextDecoder } from "util";
+
+export async function arrbufToStr(arrayBuffer : ArrayBuffer) {
+    return new TextDecoder().decode(new Uint8Array(arrayBuffer));
+}

app/lib/whisper.ts

@@ -3,6 +3,7 @@ import * as FileSystem from "expo-file-system";
 import { File, Paths } from "expo-file-system/next";
 import { getDb } from "./db";
 import * as Crypto from "expo-crypto";
+import { arrbufToStr } from "./util";
 
 export const WHISPER_MODEL_PATH = Paths.join(
   FileSystem.documentDirectory || "file:///",
@@ -75,7 +76,7 @@ export const WHISPER_MODELS = {
     size: 6173629930,
   },
 } as {
-  [key:whisper_model_tag_t]: {
+  [key: whisper_model_tag_t]: {
     source: string;
     target: string;
     label: string;
@@ -114,6 +115,12 @@ export type download_status_t = {
 };
 
 export class WhisperFile {
+  hf_metadata: hf_metadata_t | undefined;
+
+  target_hash: string | undefined;
+  does_target_exist: boolean = false;
+  download_data: FileSystem.DownloadProgressData | undefined;
+
   constructor(
     public tag: whisper_model_tag_t,
     private targetFileName?: string,
@@ -122,11 +129,11 @@ export class WhisperFile {
   ) {
     this.targetFileName = this.targetFileName || `${tag}.bin`;
     this.label =
-      this.label || `${tag[0].toUpperCase}${tag.substring(1).toLowerCase()}`;
+      this.label || `${tag[0].toUpperCase()}${tag.substring(1).toLowerCase()}`;
   }
 
   get targetPath() {
-    return Paths.join(WHISPER_MODEL_DIR, this.targetFileName as string);
+    return Paths.join(WHISPER_MODEL_PATH, this.targetFileName as string);
   }
 
   get targetFile() {
@@ -137,78 +144,30 @@ export class WhisperFile {
     return await FileSystem.getInfoAsync(this.targetPath);
   }
 
-  async doesTargetExist() {
+  async updateTargetExistence() {
-    return (await this.getTargetInfo()).exists;
+    this.does_target_exist = (await this.getTargetInfo()).exists;
   }
 
-  public async recordLatestTargetHash() {
+  public async getTargetSha() {
-    if (!(await this.doesTargetExist())) {
+    await this.updateTargetExistence();
-      console.debug("%s does not exist", this.targetPath);
+    if (!this.does_target_exist) {
-    }
-    const digest1Str = await this.getActualTargetHash();
-    if (!digest1Str) {
-      return;
-    }
-    const db = await getDb();
-    await db("whisper_models")
-      .upsert({
-        model: this.tag,
-        last_hash: digest1Str,
-      })
-      .where({ model: this.tag });
-  }
-
-  public async getRecordedTargetHash(): Promise<string> {
-    const db = await getDb();
-    const row = await db("whisper_models").select("last_hash").where({
-      model: this.tag,
-    }).first();
-    return row["last_hash"]
-  }
-
-  public async getActualTargetHash(): Promise<string | undefined> {
-    if (!(await this.doesTargetExist())) {
       console.debug("%s does not exist", this.targetPath);
       return undefined;
     }
-    const digest1 = await Crypto.digest(
+    return await Crypto.digest(
       Crypto.CryptoDigestAlgorithm.SHA256,
       this.targetFile.bytes()
     );
-    const digest1Str = new TextDecoder().decode(new Uint8Array(digest1));
-    return digest1Str;
   }
 
-  async isTargetCorrupted() {
+  public async updateTargetHash() {
-    const recordedTargetHash = await this.getRecordedTargetHash();
+    const targetSha = await this.getTargetSha();
-    const actualTargetHash = await this.getActualTargetHash();
+    if (!targetSha) return;
-    if (!(actualTargetHash || recordedTargetHash)) return false;
+    this.target_hash = await arrbufToStr(targetSha);
-    return actualTargetHash !== recordedTargetHash;
   }
 
-  async isDownloadComplete() {
+  get isHashValid() {
-    if (!(await this.doesTargetExist())) {
+    return this.target_hash === this.hf_metadata?.oid;
-      console.debug("%s does not exist", this.targetPath);
-      return false;
-    }
-    const data = this.targetFile.bytes();
-    const meta = await this.fetchMetadata();
-    const expectedHash = meta.oid;
-    const digest1: ArrayBuffer = await Crypto.digest(
-      Crypto.CryptoDigestAlgorithm.SHA256,
-      data
-    );
-    const digest1Str = new TextDecoder().decode(new Uint8Array(digest1));
-    const doesMatch = digest1Str === expectedHash;
-    if (!doesMatch) {
-      console.debug(
-        "sha256 of '%s' does not match expected '%s'",
-        digest1Str,
-        expectedHash
-      );
-      return false;
-    }
-    return true;
   }
 
   delete(ignoreErrors = true) {
@@ -231,7 +190,21 @@ export class WhisperFile {
     return create_hf_url(this.tag, "raw");
   }
 
-  private async fetchMetadata(): Promise<hf_metadata_t> {
+  get percentDone() {
+    if (!this.download_data) return 0;
+    return (
+      (this.download_data.totalBytesWritten /
+        this.download_data.totalBytesExpectedToWrite) *
+      100
+    );
+  }
+
+  get percentLeft() {
+    if (!this.download_data) return 0;
+    return 100 - this.percentDone;
+  }
+
+  public async syncHfMetadata() {
     try {
       const resp = await fetch(this.metadataUrl, {
         credentials: "include",
@@ -253,7 +226,7 @@ export class WhisperFile {
         mode: "cors",
       });
       const text = await resp.text();
-      return Object.fromEntries(
+      this.hf_metadata = Object.fromEntries(
         text.split("\n").map((line) => line.split(" "))
       ) as hf_metadata_t;
     } catch (err) {
@@ -262,21 +235,6 @@ export class WhisperFile {
     }
   }
 
-  async updateMetadata() {
-    const metadata = await this.fetchMetadata();
-    this.size = Number.parseInt(metadata.size);
-  }
-
-  async addToDatabase() {
-    const db = await getDb();
-    await db("whisper_models").upsert({
-      model: this.tag,
-      expected_size: this.size,
-    }).where({
-      model: this.tag,
-    });
-  }
-
   async createDownloadResumable(
     options: {
       onData?: DownloadCallback | undefined;
@@ -284,65 +242,43 @@ export class WhisperFile {
       onData: undefined,
     }
   ) {
-    const existingData = (await this.doesTargetExist())
+    await this.syncHfMetadata();
+
+    // If the whisper model dir doesn't exist, create it.
+    if (!WHISPER_MODEL_DIR.exists) {
+      FileSystem.makeDirectoryAsync(WHISPER_MODEL_PATH, {
+        intermediates: true,
+      });
+    }
+
+    // Check for the existence of the target file
+    // If it exists, load the existing data.
+    await this.updateTargetExistence();
+    const existingData = this.does_target_exist
       ? this.targetFile.text()
       : undefined;
 
-    if (await this.doesTargetExist()) {
+    // Create the resumable.
-    }
-
     return FileSystem.createDownloadResumable(
       this.modelUrl,
       this.targetPath,
       {},
       async (data: FileSystem.DownloadProgressData) => {
-        const db = await getDb();
+        this.download_data = data;
-        await db.upsert({
+        await this.syncHfMetadata();
-          model: this.tag,
+        await this.updateTargetHash();
-          download_status: "active",
+        await this.updateTargetExistence();
-        })
+        if (options.onData) await options.onData(this);
-        await this.recordLatestTargetHash();
-        if (options.onData) await options.onData(data);
       },
       existingData ? existingData : undefined
     );
   }
-
-  async getDownloadStatus() : Promise<download_status_t> {
-    const doesTargetExist = await this.doesTargetExist();
-    const isDownloadComplete = await this.isDownloadComplete();
-    const hasDownloadStarted = doesTargetExist && !isDownloadComplete;
-
-    if (!this.size) {
-      return {
-        doesTargetExist: false,
-        isDownloadComplete: false,
-        hasDownloadStarted: false,
-        progress: undefined,
-      }
-    }
-
-    const remaining = hasDownloadStarted
-      ? this.size - (this.targetFile.size as number)
-      : 0;
-
-    const progress = hasDownloadStarted
-      ? {
-          current: this.targetFile.size || 0,
-          total: this.size,
-          remaining: this.size - (this.targetFile.size as number),
-          percentRemaining: (remaining / this.size) * 100.0,
-        }
-      : undefined;
-
-    return {
-      doesTargetExist,
-      isDownloadComplete,
-      hasDownloadStarted,
-      progress,
-    };
-  }
 }
 
+export type DownloadCallback = (arg0: WhisperFile) => any;
 
-export type DownloadCallback = (arg0: FileSystem.DownloadProgressData) => any;
+export const WHISPER_FILES = {
+  small: new WhisperFile("small"),
+  medium: new WhisperFile("medium"),
+  large: new WhisperFile("large"),
+};

components/LanguageSelection.tsx

@@ -8,6 +8,7 @@ import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
 import { Conversation, Speaker } from "@/app/lib/conversation";
 import { NavigationProp, ParamListBase } from "@react-navigation/native";
 import { Link, useNavigation } from "expo-router";
+import { migrateDb } from "@/app/lib/db";
 
 
 export function LanguageSelection(props: {
@@ -30,6 +31,7 @@ export function LanguageSelection(props: {
 
   useEffect(() => {
     (async () => {
+      await migrateDb();
       try {
         // Replace with your actual async data fetching logic
         setTranslator(await CachedTranslator.getDefault());
@@ -49,12 +51,12 @@ export function LanguageSelection(props: {
         <Text>Settings</Text>
       </Pressable>
       <ScrollView >
-        <SafeAreaProvider >
+        <SafeAreaProvider>
-          <SafeAreaView>
+          <SafeAreaView style={styles.table}>
             {(languages && languagesLoaded) ? Object.entries(languages).filter((l) => (LANG_FLAGS as any)[l[0]] !== undefined).map(
               ([lang, lang_entry]) => {
                 return (
-                  <ISpeakButton language={lang_entry} key={lang_entry.code} onLangSelected={onLangSelected} translator={translator} />
+                    <ISpeakButton language={lang_entry} key={lang_entry.code} onLangSelected={onLangSelected} translator={translator} />
                 );
               }
             ) : <Text>Waiting...</Text>
@@ -66,11 +68,15 @@ export function LanguageSelection(props: {
   )
 }
 
+const DEBUG_BORDER = {
+  borderWidth: 3,
+  borderStyle: "dotted",
+  borderColor: "blue",
+}
+
 const styles = StyleSheet.create({
-  column: {
+  table: {
-    flex: 1,
+    flexDirection: "row",
-    flexDirection: 'row',
+    flexWrap: "wrap",
-    flexWrap: 'wrap',
-    padding: 8,
   },
 })

components/Settings.tsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { View, Text, TextInput, Pressable, StyleSheet } from "react-native";
 import {
+  WHISPER_FILES,
   WhisperFile,
   download_status_t,
   whisper_tag_t,
@@ -34,33 +35,36 @@ const SettingsComponent = () => {
   } | null>(null);
   const [whisperModel, setWhisperModel] =
     useState<keyof typeof WHISPER_MODELS>("small");
-  const [downloader, setDownloader] = useState<any>(null);
   const [whisperFile, setWhisperFile] = useState<WhisperFile | undefined>();
-  const [downloadStatus, setDownloadStatus] = useState<
+  const [whisperFileExists, setWhisperFileExists] = useState<boolean>(false);
-    undefined | download_status_t
+  const [isWhisperHashValid, setIsWhisperHashValid] = useState<boolean>(false);
-  >();
+  const [downloader, setDownloader] = useState<any>(null);
+  const [bytesDone, setBytesDone] = useState<number | undefined>();
+  const [bytesRemaining, setBytesRemaining] = useState<number | undefined>();
   const [statusTimeout, setStatusTimeout] = useState<
     NodeJS.Timeout | undefined
   >();
 
   useEffect(() => {
-    loadSettings();
+    (async function () {
-  }, []);
+      const settings = await Settings.getDefault();
+      setHostLanguage((await settings.getHostLanguage()) || "en");
+      setLibretranslateBaseUrl(
+        (await settings.getLibretranslateBaseUrl()) || LIBRETRANSLATE_BASE_URL
+      );
+      setWhisperModel((await settings.getWhisperModel()) || "small");
+      setWhisperFile(WHISPER_FILES[whisperModel]);
+      await whisperFile?.syncHfMetadata();
+      await whisperFile?.updateTargetExistence();
+      await whisperFile?.updateTargetHash();
+    })();
+  }, [whisperFile]);
 
   const getLanguageOptions = async () => {
     const languageServer = await LanguageServer.getDefault();
     setLanguageOptions(await languageServer.fetchLanguages());
   };
 
-  const loadSettings = async () => {
-    const settings = await Settings.getDefault();
-    setHostLanguage((await settings.getHostLanguage()) || "en");
-    setLibretranslateBaseUrl(
-      (await settings.getLibretranslateBaseUrl()) || LIBRETRANSLATE_BASE_URL
-    );
-    setWhisperModel(await settings.getWhisperModel());
-  };
-
   const handleHostLanguageChange = async (lang: string) => {
     const settings = await Settings.getDefault();
     setHostLanguage(lang);
@@ -83,17 +87,24 @@ const SettingsComponent = () => {
     }
   };
 
-  const intervalUpdateDownloadStatus = async () => {
-    if (!whisperFile) return;
-    const status = await whisperFile.getDownloadStatus();
-    setDownloadStatus(status);
-  };
-
   const handleWhisperModelChange = async (model: whisper_tag_t) => {
     const settings = await Settings.getDefault();
     await settings.setWhisperModel(model);
     setWhisperModel(model);
-    setWhisperFile(new WhisperFile(model));
+    const wFile = WHISPER_FILES[whisperModel];
+    await wFile.syncHfMetadata();
+    await wFile.updateTargetExistence();
+    await wFile.updateTargetHash();
+    setIsWhisperHashValid(wFile.isHashValid);
+    setWhisperFile(wFile);
+    setWhisperFileExists(wFile.does_target_exist);
+  };
+
+  const doSetDownloadStatus = (arg0: WhisperFile) => {
+    console.log("Downloading ....")
+    setIsWhisperHashValid(arg0.isHashValid);
+    setBytesDone(arg0.download_data?.totalBytesWritten);
+    setBytesRemaining(arg0.download_data?.totalBytesExpectedToWrite);
   };
 
   const doDownload = async () => {
@@ -101,16 +112,16 @@ const SettingsComponent = () => {
       throw new Error("Could not start download because whisperModel not set.");
     }
 
-    console.log("Starging download of %s", whisperModel)
+    console.log("Starting download of %s", whisperModel);
 
-    const whisperFile = new WhisperFile(whisperModel);
+    if (!whisperFile) throw new Error("No whisper file");
 
-    const resumable = await whisperFile.createDownloadResumable();
-    setDownloader(resumable);
     try {
-      await resumable.downloadAsync();
+      const resumable = await whisperFile.createDownloadResumable({
-      const statusTimeout = setInterval(intervalUpdateDownloadStatus, 200);
+        onData: doSetDownloadStatus,
-      setStatusTimeout(statusTimeout);
+      });
+      setDownloader(resumable);
+      await resumable.resumeAsync();
     } catch (error) {
       console.error("Failed to download whisper model:", error);
     }
@@ -174,28 +185,22 @@ const SettingsComponent = () => {
         ))}
       </Picker>
       <View>
-        {whisperModel &&
+        {/* <Text>whisper file: { whisperFile?.tag }</Text> */}
-          (downloadStatus?.isDownloadComplete ? (
+        {whisperFile &&
-            downloadStatus?.doesTargetExist ? (
+        ( whisperFileExists && (<Pressable onPress={doDelete} style={styles.deleteButton}>
-              <Pressable onPress={doDelete}>
+          <Text>DELETE {whisperModel.toUpperCase()}</Text>
-                <Text>DELETE {whisperModel.toUpperCase()}</Text>
+        </Pressable>))
-              </Pressable>
+}
-            ) : (
+            <Pressable onPress={doDownload} style={styles.pauseDownloadButton}>
-              <Pressable onPress={doStopDownload}>
-                <Text>PAUSE</Text>
-              </Pressable>
-            )
-          ) : (
-            <Pressable onPress={doDownload}>
               <Text>DOWNLOAD {whisperModel.toUpperCase()}</Text>
             </Pressable>
           ))}
-        {downloadStatus?.progress && (
+        {bytesDone && bytesRemaining && (
           <View>
             <Text>
-              {downloadStatus.progress.current} of{" "}
+              {bytesDone} of{" "}
-              {downloadStatus.progress.total} (
+              {bytesRemaining} (
-              {downloadStatus.progress.percentRemaining} %){" "}
+              {bytesDone / bytesRemaining * 100} %){" "}
             </Text>
           </View>
         )}

components/__tests__/index.spec.tsx

@@ -1,5 +1,5 @@
 jest.mock("@/app/i18n/api", () => require("../../__mocks__/api.ts"));
-import { renderRouter} from 'expo-router/testing-library';
+import { renderRouter } from "expo-router/testing-library";
 import React from "react";
 import {
   act,
@@ -13,14 +13,21 @@ import {
   createNavigationContainerRef,
 } from "@react-navigation/native";
 import TTNavStack from "../TTNavStack";
+import { migrateDb } from "@/app/lib/db";
 
 describe("Navigation", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
+    await migrateDb("development", "up");
     // Reset the navigation state before each test
-    jest.clearAllMocks();
     jest.useFakeTimers();
   });
 
+  afterEach(async () => {
+    await migrateDb("development", "down");
+    jest.clearAllMocks();
+    jest.useRealTimers();
+  });
+
   it("Navigates to ConversationThread on language selection", async () => {
     const MockComponent = jest.fn(() => <TTNavStack />);
     renderRouter(
@@ -28,7 +35,7 @@ describe("Navigation", () => {
         index: MockComponent,
       },
       {
-        initialUrl: '/',
+        initialUrl: "/",
       }
     );
     const languageSelectionText = await waitFor(() =>
@@ -47,14 +54,16 @@ describe("Navigation", () => {
         index: MockComponent,
       },
       {
-        initialUrl: '/',
+        initialUrl: "/",
       }
     );
     const settingsButton = await waitFor(() =>
       screen.getByText(/.*Settings.*/i)
     );
     fireEvent.press(settingsButton);
-    expect(await waitFor(() => screen.getByText(/Settings/i))).toBeOnTheScreen();
+    expect(
+      await waitFor(() => screen.getByText(/Settings/i))
+    ).toBeOnTheScreen();
     // expect(waitFor(() => screen.getByText(/Settings/i))).toBeTruthy()
     expect(screen.getByText("Settings")).toBeOnTheScreen();
   });

components/ui/ISpeakButton.tsx

@@ -106,7 +106,12 @@ const ISpeakButton = (props: ISpeakButtonProps) => {
         <View style={styles.flag}>
           {countries &&
             countries.map((c) => {
-              return <CountryFlag isoCode={c} size={25} key={c} />;
+              return (
+                <View>
+                  <Text>{c}</Text>
+                  <CountryFlag isoCode={c} size={25} key={c} />
+                </View>
+              );
             })}
         </View>
         <View>
@@ -121,14 +126,13 @@ const ISpeakButton = (props: ISpeakButtonProps) => {
 
 const styles = StyleSheet.create({
   button: {
-    width: "20%",
     borderRadius: 10,
     borderColor: "white",
     borderWidth: 1,
     borderStyle: "solid",
     height: 110,
-    alignSelf: "flex-start",
+    width: 170,
-    margin: 8,
+    margin: 10,
   },
   flag: {},
   iSpeak: {

components/ui/__tests__/Settings.spec.tsx

@@ -3,9 +3,10 @@ import { render, screen, fireEvent, act } from "@testing-library/react-native";
 import SettingsComponent from "@/components/Settings";
 import { language_matrix } from "@/app/i18n/api";
 import { Settings } from "@/app/lib/settings";
-import { getDb } from "@/app/lib/db";
+import { getDb, migrateDb } from "@/app/lib/db";
 import { Knex } from "knex";
 import { WhisperFile } from "@/app/lib/whisper";
+import { SQLiteDatabase } from "expo-sqlite";
 
 const RENDER_TIME = 1000;
 
@@ -77,11 +78,12 @@ jest.mock("@/app/i18n/api", () => {
 
 
 describe("SettingsComponent", () => {
-  let db: Knex;
+  let db: SQLiteDatabase;
   let settings: Settings;
 
   beforeEach(async () => {
     db = await getDb("development");
+    await migrateDb("development");
     settings = new Settings(db);
     jest.spyOn(Settings, 'getDefault').mockResolvedValue(settings);
     await settings.setHostLanguage("en");
@@ -90,8 +92,7 @@ describe("SettingsComponent", () => {
 
   afterEach(async () => {
     jest.restoreAllMocks();
-    await db.migrate.down();
+    await migrateDb("development", "down");
-    await db.destroy();
   });
 
   beforeAll(async () => {

jestSetup.ts

@@ -9,43 +9,37 @@ jest.mock("expo-sqlite", () => {
 
   const { MIGRATE_UP } = jest.requireActual("./app/lib/migrations");
 
+  const genericRun = (sql: string, ... params : string []) => {
+    // console.log("Running %s with %s", sql, params);
+    try {
+      const stmt = db.prepare(sql);
+      stmt.run(...params);
+    } catch (e) {
+      throw new Error(
+        `running ${sql} with params ${JSON.stringify(params)}: ${e}`
+      );
+    }
+  }
+
+  const genericGetFirst = (sql: string, params = []) => {
+    const stmt = db.prepare(sql);
+    // const result = stmt.run(...params);
+    return stmt.get(params);
+  };
+
   const openDatabaseAsync = async (name: string) => {
     return {
       closeAsync: jest.fn(() => db.close()),
       executeSql: jest.fn((sql: string) => db.exec(sql)),
-      runAsync: jest.fn(async (sql: string, params = []) => {
+      runAsync: jest.fn(genericRun),
-        for (let m of Object.values(MIGRATE_UP)) {
+      runSync: jest.fn(genericRun),
-          for (let stmt of m) {
+      getFirstAsync: jest.fn(genericGetFirst),
-            const s = db.prepare(stmt);
+      getFirstSync: jest.fn(genericGetFirst),
-            s.run();
-          }
-        }
-        const stmt = db.prepare(sql);
-        // console.log("Running %s with %s", sql, params);
-        try {
-          stmt.run(params);
-        } catch (e) {
-          throw new Error(
-            `running ${sql} with params ${JSON.stringify(params)}: ${e}`
-          );
-        }
-      }),
-      getFirstAsync: jest.fn(async (sql: string, params = []) => {
-        for (let m of Object.values(MIGRATE_UP)) {
-          for (let stmt of m) {
-            const s = db.prepare(stmt);
-            s.run();
-          }
-        }
-        const stmt = db.prepare(sql);
-        // const result = stmt.run(...params);
-        return stmt.get(params);
-      }),
     };
   };
   return {
     migrateDb: async (direction: "up" | "down" = "up") => {
-      const db = await openDatabaseAsync("translation_terrace");
+      const db = await openDatabaseAsync("translation_terrace_development");
       for (let m of Object.values(MIGRATE_UP)) {
         for (let stmt of m) {
           await db.executeSql(stmt);
@@ -119,4 +113,18 @@ jest.mock('@/app/lib/settings', () => {
       ...originalModule,
       default: MockSettings
   };
-});
+});
+
+jest.mock('expo-file-system', () => ({
+    // ... other methods ...
+    createDownloadResumable: jest.fn(() => ({
+      downloadAsync: jest.fn(() => Promise.resolve({ uri: 'mocked-uri' })),
+      pauseAsync: jest.fn(() => Promise.resolve()),
+      resumeAsync: jest.fn(() => Promise.resolve()),
+      cancelAsync: jest.fn(() => Promise.resolve()),
+    })),
+    getInfoAsync: jest.fn(() => ({
+      exists: () => false,
+    }))
+    // ... other methods ...
+}));