CHANGELOG.md

@@ -1,22 +0,0 @@
-# Changelog
-
-## [Unreleased]
-
-### Added
-- Firefox support
-
-### Changed
-- explicit close of databases
-- Updated readme
-- Add changelog
-
-## [0.1.0] - 2024-06-07
-
-### Added
-- initial release
-- `init` subcommand
-- `add` subcommand
-- Chromium support
-
-[unreleased]: https://github.com/qwjyh/browser-history-merger/compare/v0.1.0...HEAD
-[0.1.0]: https://github.com/qwjyh/browser-history-merger/releases/tag/v0.1.0

README.md

@@ -2,55 +2,20 @@
 
 Merge browser histories into a single database.
 
-## Usage
+# Usage
-### Initialization
+## Initialization
 For the first execution on each device and browser, do
 ```sh
-browser-history-merger path/to/merged.db init browser-id /abs/path/to/browser/history/database
+browser-history-merger path/to/merged.db init browser-id path/to/browser/history/database
 ```
 `browser-id` should be unique to identify browser and machine.
 
-### Add histories
+## Add histories
 Then add histories to the database by
 ```sh
 browser-history-merger path/to/merged.db add browser-id
 ```
 
-## Supported environments
+# Tips
-Python 3.12 (works with standard libraries only)
-
-- Chromium
-  - Tested:
-    - chrome on windows, linux
-    - brave on windows, linux
-    - vivaldi on linux
-- Firefox
-  - Tested:
-    - firefox on windows
-
-## Tips
 The program is a single file `./src/browser_history_merger/__init__.py` and can be used as a script.
 
-### Example SQL to see the history
-
-```sql
-SELECT
-	browsers.name,
-	visits.title,
-	visits.url,
-	datetime(visits.visit_time / 1000000 - 11644473600, 'unixepoch')
-FROM
-	visits,
-	browsers
-WHERE
-	visits.browser = browsers.id
-ORDER by
-	visits.visit_time
-	DESC LIMIT 0, 100
-```
-
-## Todo
-- exporting
-  - JSON output
-  - browser list
-- multiple profiles?

requirements-dev.lock

@@ -6,6 +6,5 @@
 #   features: []
 #   all-features: false
 #   with-sources: false
-#   generate-hashes: false
 
 -e file:.

requirements.lock

@@ -6,6 +6,5 @@
 #   features: []
 #   all-features: false
 #   with-sources: false
-#   generate-hashes: false
 
 -e file:.

src/browser_history_merger/__init__.py

@@ -3,11 +3,8 @@ import argparse
 import logging
 import socket
 import sqlite3
-from typing import Literal, Tuple
+from typing import Literal
 
-# ref: https://en.wikiversity.org/wiki/Chromium_browsing_history_database
-# Time offset of chromium to unixepoch
-CHROMIUM_TIME_OFFSET = 11644473600 * 1_000_000
 
 def init_db(
     root_con: sqlite3.Connection, root_cur: sqlite3.Cursor, args: argparse.Namespace
@@ -135,43 +132,6 @@ def init_db(
     )
     root_con.commit()
 
-    # cleanup
-    root_con.close()
-
-
-def open_browser_db(database_path: str) -> Tuple[sqlite3.Connection, Literal["firefox", "chromium"]]:
-    dburi = f"file:{database_path}?mode=ro&nolock=1"
-    logging.info(f"DB uri: {dburi}")
-    con = sqlite3.connect(dburi, uri=True)
-    cur = con.cursor()
-
-    logging.debug(f"{con=}")
-    logging.debug(f"{cur=}")
-    try:
-        res = cur.execute(
-            """
-            SELECT
-                *
-            FROM
-                sqlite_master
-            WHERE
-                type='table' AND name='urls'
-            """
-        )
-        res.fetchone()
-    except sqlite3.OperationalError as e:
-        if "unable to open database file" in str(e):
-            # might be firefox
-            logging.debug("Failed to open db while executing SELECT from sqlite_master")
-            dburi = f"file:{database_path}?mode=ro"
-            con = sqlite3.connect(dburi, uri=True)
-            cur = con.cursor()
-        else:
-            raise e
-    db_type = get_db_type(cur)
-    logging.info(f"DB type: {db_type}")
-    return con, db_type
-
 
 def get_db_type(cur: sqlite3.Cursor) -> Literal["firefox", "chromium"]:
     res = cur.execute(
@@ -238,14 +198,6 @@ def convert_firefox_transition_type(transition_type: int) -> int:
             return 0
 
 
-def convert_firefox_datetime_to_choromium(time: str) -> str:
-    """
-    Convert time in Firefox to Chromium format.
-    """
-    num = int(time)
-    return str(num + CHROMIUM_TIME_OFFSET)
-
-
 def add_db(
     root_con: sqlite3.Connection, root_cur: sqlite3.Cursor, args: argparse.Namespace
 ):
@@ -256,43 +208,18 @@ def add_db(
     logging.info(f"Source: {database_path}")
     logging.info(f"Root:   {args.root_db}")
 
-    con, db_type = open_browser_db(database_path)
+    dburi = f"file:{database_path}?mode=ro&nolock=1"
+    logging.info(f"DB uri: {dburi}")
+    con = sqlite3.connect(dburi, uri=True)
     cur = con.cursor()
 
+    db_type = get_db_type(cur)
+    logging.info(f"DB type: {db_type}")
+
     match db_type:
         case "firefox":
-            select_url_toupdate_sql = """
+            logging.error("Not implemented")
-            SELECT
+            raise RuntimeError("Not implemented")
-                moz_places.id,
-                moz_places.url,
-                moz_places.title
-            FROM
-                moz_historyvisits,
-                moz_places
-            WHERE
-                moz_historyvisits.visit_date > (?) - 11644473600000000
-                AND moz_historyvisits.place_id = moz_places.id
-            """
-            select_visit_sql = """
-            SELECT
-                moz_historyvisits.id,
-                moz_historyvisits.place_id,
-                moz_places.url,
-                moz_places.title,
-                moz_historyvisits.visit_date,
-                moz_historyvisits.from_visit,
-                moz_historyvisits.visit_type
-            FROM
-                moz_historyvisits,
-                moz_places
-            WHERE
-                moz_historyvisits.visit_date > (?) - 11644473600000000
-                AND moz_historyvisits.place_id = moz_places.id
-            """
-            convert_transition_type = convert_firefox_transition_type
-            # Firefox doesn't have transition_qualifier
-            convert_transition_qualifier = lambda _: None
-            convert_visit_time = convert_firefox_datetime_to_choromium
         case "chromium":
             select_url_toupdate_sql = """
             SELECT
@@ -324,7 +251,6 @@ def add_db(
             """
             convert_transition_type = convert_chromium_transition_type
             convert_transition_qualifier = lambda x: x
-            convert_visit_time = lambda x: x
     res = cur.execute(select_url_toupdate_sql, [visits_time_max])
     updating_urls = (
         (
@@ -352,7 +278,7 @@ def add_db(
             url_id,
             url,
             title,
-            convert_visit_time(visit_time),
+            visit_time,
             from_visit,
             convert_transition_qualifier(transition),
             convert_transition_type(transition),
@@ -382,7 +308,7 @@ def add_db(
         [browser_id],
     )
     (new_urls_time_max,) = res.fetchone()
-    logging.info(f"{new_urls_time_max=} (in chromium format)")
+    logging.info(f"{new_urls_time_max=}")
     root_cur.execute(
         """
         UPDATE
@@ -397,10 +323,6 @@ def add_db(
     root_con.commit()
     logging.info("Updated browser information")
 
-    # cleanup
-    root_con.close()
-    con.close()
-
 
 def main() -> int:
     parser = argparse.ArgumentParser(description="Browser history merger")