Merge pull request #4 from zarmstrong/new-table-test

created a new method of tracking redeemed keys, unique per platform

Author: zarmstrong

Readme.md

@@ -49,6 +49,16 @@ mkdir -p ./data
 
 ## Usage
 
+# ⚠️ Database Change Notice
+
+**As of the 9/18/2025 version, the way redeemed keys are tracked has changed.**  
+Redemption status is now tracked in a separate table for each key and platform combination.  
+
+**On first run after upgrade, all keys will be retried to ensure the database is properly marked. This may take a long time if you have a large key database.**  
+This is expected and only happens once; subsequent runs will be fast.
+
+## Usage Instructions
+
 You can now specify exactly which platforms should redeem which games' SHiFT codes using the `--redeem` argument.  
 **Recommended:** Use `--redeem` for fine-grained control.  
 **Legacy:** You can still use `--games` and `--platforms` together, but a warning will be printed and all games will be redeemed on all platforms.

migrations.py

@@ -46,7 +46,7 @@ def register(version: int):
 
     def wrap(func):
         @wraps(func)
-        def wrapper(conn):
+        def wrapper(conn, *args, **kwargs):  # Accept extra arguments for compatibility
             try:
                 if func(conn):
                     conn.cursor().execute("PRAGMA user_version = {}".format(version))
@@ -129,3 +129,67 @@ def update_1(conn: sqlite3.Connection):
             _L.error(f"'{e}' in\n{step}")
             return False
     return True
+
+
+@register(2)
+def migrate_redeemed_per_platform(conn):
+    """
+    Ensure that each (code, game, platform) has its own redeemed status.
+    If there are any rows with the same code/game but different platforms,
+    ensure each has its own redeemed field.
+    """
+    c = conn.cursor()
+    # Check for duplicate codes across platforms
+    c.execute(
+        """
+        SELECT code, game, COUNT(DISTINCT platform) as platform_count
+        FROM keys
+        GROUP BY code, game
+        HAVING platform_count > 1
+    """
+    )
+    duplicates = c.fetchall()
+    # If there are duplicates, ensure each has its own redeemed field (already true in schema)
+    # This migration is a no-op unless you want to do data cleanup.
+    # Optionally, you could log or clean up here.
+    return True
+
+
+@register(3)
+def migrate_redeemed_table(conn):
+    """
+    Move redeemed status to a new redeemed_keys table and remove the redeemed column from keys.
+    Do NOT migrate redeemed=1 rows, as we cannot know for which platforms they were redeemed.
+    """
+    c = conn.cursor()
+    # 1. Create new table if not exists
+    c.execute(
+        """
+        CREATE TABLE IF NOT EXISTS redeemed_keys (
+            key_id INTEGER,
+            platform TEXT,
+            PRIMARY KEY (key_id, platform),
+            FOREIGN KEY (key_id) REFERENCES keys(id)
+        )
+    """
+    )
+    # 2. Remove redeemed column from keys (SQLite doesn't support DROP COLUMN directly)
+    c.execute("PRAGMA table_info(keys)")
+    columns = [col[1] for col in c.fetchall() if col[1] != "redeemed"]
+    columns_str = ", ".join(columns)
+    c.execute(f"ALTER TABLE keys RENAME TO keys_old")
+    c.execute(
+        f"""
+        CREATE TABLE keys (
+            id INTEGER primary key,
+            reward TEXT,
+            code TEXT,
+            platform TEXT,
+            game TEXT
+        )
+    """
+    )
+    c.execute(f"INSERT INTO keys ({columns_str}) SELECT {columns_str} FROM keys_old")
+    c.execute("DROP TABLE keys_old")
+    conn.commit()
+    return True