update level cards

Author: noisecode3

database/main.py

@@ -13,8 +13,8 @@ def show_menu():
     print("1. new - Create a new empty index database and add static data")
     print("2. new - Create a new full index database, without info and walkthrough data")
     print("3. new - Create a new full index database, with info and walkthrough data")
-    print("4. update - Insert missing TRLE book basic records")
-    print("5. update - Insert missing TRLE book records with info and walkthrough")
+    print("4. update - Insert missing TRLE card records")
+    print("5. update - Insert missing TRLE full records with info and walkthrough")
     print("6. resync all - Update or remove every record to mirror TRLE")
     print("7. trle - Run https TRLE")
     print("8. trle_local - Run TRLE local")
@@ -30,15 +30,17 @@ def main_menu():
         if choice == "1":
             make_tombll_database.run()
         elif choice == "2":
-            pass
+            make_tombll_database.run()
+            tombll_view.update_level_cards()
         elif choice == "3":
-            pass
+            make_tombll_database.run()
+            tombll_view.update_levels()
         elif choice == "4":
-            pass
+            tombll_view.update_level_cards()
         elif choice == "5":
-            pass
+            tombll_view.update_levels()
         elif choice == "6":
-            pass
+            print("Not Implemented...")
         elif choice == "7":
             tombll_view.scrape_trle_index()
         elif choice == "8":

database/screenshot1.jpg

@@ -35,19 +35,24 @@ def print_info():
       -rm   [lid] Remove one level record
       -u    [lid] Update a level record
 
-      -ld   [Level.LevelID] List download files records
-      -ad   [Level.LevelID Zip.name Zip.size Zip.md5sum]
+      -ld   [lid] List download files records
+      -ad   [lid Zip.name Zip.size Zip.md5sum]
                 Add a local zip file to a level without a file
 """
     print(help_text.strip())
 
 
 def list_levels():
-    """List all level in the database."""
+    """Retrieve and prints a list of level information."""
+    # Fetch all rows
     con = database_make_connection()
-    print_list(con)
+    results = tombll_read.database_level_list(con)
     con.close()
 
+    # Iterate over the results and print each row
+    for row in results:
+        print(row)
+
 
 def add_level(lid):
     """Add a level by taking the lid number."""
@@ -173,16 +178,23 @@ def add_download(lid, name, size, md5):
 
     con = database_make_connection()
     database_begin_write(con)
-    tombll_create.database_zip_file(data, lid, con)
+    level_id = tombll_read.database_level_id(lid, con)
+    tombll_create.database_zip_file(data, level_id, con)
     database_commit_and_close(con)
 
 
 def list_downloads(lid):
-    """List all download files for a level by taking the lid number."""
+    """Print a list of ZIP file entries associated with a specific level."""
+    # Fetch all rows
     con = database_make_connection()
-    print_download_list(lid, con)
+    level_id = tombll_read.database_level_id(lid, con)
+    results = tombll_read.database_zip_list(level_id, con)
     con.close()
 
+    # Print each row in the result
+    for row in results:
+        print(row)
+
 
 def get_local_page(offset, con):
     """Pass down API to get a TRLE page from the database."""
@@ -232,25 +244,6 @@ def database_commit_and_close(con):
     con.close()
 
 
-def print_list(con):
-    """
-    Retrieve and prints a list of level information.
-
-    Args:
-        con (sqlite3.Connection): An open SQLite database connection.
-
-    Returns:
-        None: This function does not return any value.
-        It prints the results directly to the console.
-    """
-    # Fetch all rows
-    results = tombll_read.database_level_list(con)
-
-    # Iterate over the results and print each row
-    for row in results:
-        print(row)
-
-
 def trle_level_url(lid):
     """
     Get level TRLE url from lid number.
@@ -261,26 +254,6 @@ def trle_level_url(lid):
     return f"https://www.trle.net/sc/levelfeatures.php?lid={lid}"
 
 
-def print_download_list(level_id, con):
-    """
-    Print a list of ZIP file entries associated with a specific level.
-
-    Args:
-        level_id (int): The ID of the level for which to retrieve ZIP files.
-        con (sqlite3.Connection): An active SQLite database connection.
-
-    Returns:
-        None: This function prints the query results to the console.
-
-    """
-    # Fetch all rows
-    results = tombll_read.database_zip_list(level_id, con)
-
-    # Print each row in the result
-    for row in results:
-        print(row)
-
-
 def parse_position(s):
     """Pares the letter to int from an jpg name."""
     match = re.match(r'^(\d+)([a-z]?)$', s)

database/tombll_manage_data.py

@@ -49,7 +49,7 @@ def database_level_list(con):
         List: List of all levels.
     """
     query = '''
-        SELECT Level.LevelID, Info.Title, Author.value
+        SELECT Info.trleID, Info.Title, Author.value
         FROM Level
         JOIN Info ON Level.infoID = Info.InfoID
         JOIN AuthorList ON Level.LevelID = AuthorList.levelID
@@ -77,7 +77,7 @@ def database_zip_list(level_id, con):
         None: List of all zip files.
     """
     query = '''
-        SELECT Zip.*
+        SELECT Zip.name, Zip.size, Zip.md5sum, Zip.url, Zip.version, Zip.release
         FROM Level
         JOIN ZipList ON Level.LevelID = ZipList.levelID
         JOIN Zip ON ZipList.zipID = Zip.ZipID

database/tombll_read.py

@@ -1,4 +1,4 @@
-"""terminal menus, prompts for data, tests and setting up the database."""
+"""Terminal menus, prompts for data, tests and setting up the database."""
 
 import os
 import sqlite3
@@ -8,6 +8,65 @@
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 
+def compare_pages(estimate):
+    """Get the range from database and server pages. Its a bit stupid but lets do this at first."""
+    db_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tombll.db')
+    con = sqlite3.connect(db_path)
+    database_page = tombll_manage_data.get_local_page(0, con)
+    con.close()
+
+    database_id = 1
+    if database_page['levels']:
+        database_id = database_page['levels'][0]['trle_id']
+
+    trle_id = int(tombll_manage_data.get_trle_page(0)['levels'][0]['trle_id'])
+    total_records = trle_id - database_id + 1
+    about_time_sec = total_records * estimate
+
+    hours, remainder = divmod(about_time_sec, 3600)
+    minutes, seconds = divmod(remainder, 60)
+
+    print(f"There are {total_records} level records (or fewer) to update.")
+    print(f"Estimated time: {hours:02d}:{minutes:02d}:{seconds:02d}")
+
+    return (database_id, trle_id)
+
+
+def update_level_cards():
+    """
+    Update the database by getting the missing last card records.
+
+    Get a local page from the database and compare it to a scraped page from trle.net.
+    Then add all the level cards in the range of ID numbers from the last date ID in the database
+    to the last date ID on trle.net.
+    """
+    trle_range = compare_pages(6)
+    print("I will upload a database on MEGA to offload the server.")
+    print("The program can't even handle that many records right now.")
+    print("There is no reason for you to test this.")
+    print("Do you want to continue?")
+    awn = input("y or n: ")
+    if awn == 'y':
+        tombll_manage_data.add_level_card_range(trle_range[0], trle_range[1])
+
+
+def update_levels():
+    """
+    Update the databse by getting the missing last level records.
+
+    Get a local page from the database and then compare it by a scraped page form trle.net.
+    Then add all the level in the range of id numbers from the last date id on the database
+    to the last date id on trle.net.
+    """
+    '''
+    trle_range = compare_pages(7)
+    print("Do you want to continue?")
+    awn = input("y or n: ")
+    if awn == 'y':
+        tombll_manage_data.add_level_range(trle_range[0], trle_range[1])
+    '''
+
+
 def scrape_trle_index():
     """Browse TRLE data by using normal https requests."""
     offset = 0