fix date scraping and displaying

Author: noisecode3

database/scrape_common.py

@@ -233,7 +233,8 @@ def get_trle_class(soup):
 
 def get_trle_release(soup):
     """Extract the release date."""
-    return soup.find('td', string='release date:').find_next('td').get_text(strip=True) or ""
+    raw_date = soup.find('td', string='release date:').find_next('td').get_text(strip=True) or ""
+    return convert_to_iso(raw_date)
 
 
 def get_trle_difficulty(soup):

database/tombll_read.py

@@ -210,10 +210,8 @@ def trle_page(offset, con, limit=20, sort_latest_first=False):
     """Get a trle page."""
     page = data_factory.make_trle_page_data()
     page['offset'] = offset
-
-    order_direction = 1 if sort_latest_first else 0
-
     result = []
+
     page['records_total'] = tombll_common.query_return_everything("""
         SELECT COUNT(*)
         FROM Info
@@ -222,29 +220,50 @@ def trle_page(offset, con, limit=20, sort_latest_first=False):
         INNER JOIN Author ON Author.AuthorID = AuthorList.authorID
     """, None, con)[0][0]
 
-    result = tombll_common.query_return_everything("""
-        SELECT
-            Info.trleID,
-            Author.value,
-            Info.title,
-            InfoDifficulty.value,
-            InfoDuration.value,
-            InfoClass.value,
-            InfoType.value,
-            Info.release
-        FROM Info
-        INNER JOIN Level ON (Info.InfoID = Level.infoID)
-        INNER JOIN AuthorList ON (Level.LevelID = AuthorList.levelID)
-        INNER JOIN Author ON (Author.AuthorID = AuthorList.authorID)
-        LEFT JOIN InfoDifficulty ON (InfoDifficulty.InfoDifficultyID = Info.difficulty)
-        LEFT JOIN InfoDuration ON (InfoDuration.InfoDurationID = Info.duration)
-        INNER JOIN InfoType ON (InfoType.InfoTypeID = Info.type)
-        LEFT JOIN InfoClass ON (InfoClass.InfoClassID = Info.class)
-        ORDER BY
-            CASE WHEN ? = 0 THEN Info.release END ASC,
-            CASE WHEN ? = 1 THEN Info.release END DESC
-        LIMIT ? OFFSET ?;
-        """, (order_direction, order_direction, limit, offset), con)
+    if sort_latest_first:
+        result = tombll_common.query_return_everything("""
+            SELECT
+                Info.trleID,
+                Author.value,
+                Info.title,
+                InfoDifficulty.value,
+                InfoDuration.value,
+                InfoClass.value,
+                InfoType.value,
+                Info.release
+            FROM Info
+            INNER JOIN Level ON (Info.InfoID = Level.infoID)
+            INNER JOIN AuthorList ON (Level.LevelID = AuthorList.levelID)
+            INNER JOIN Author ON (Author.AuthorID = AuthorList.authorID)
+            LEFT JOIN InfoDifficulty ON (InfoDifficulty.InfoDifficultyID = Info.difficulty)
+            LEFT JOIN InfoDuration ON (InfoDuration.InfoDurationID = Info.duration)
+            INNER JOIN InfoType ON (InfoType.InfoTypeID = Info.type)
+            LEFT JOIN InfoClass ON (InfoClass.InfoClassID = Info.class)
+            ORDER BY Info.release DESC
+            LIMIT ? OFFSET ?
+            """, (limit, offset), con)
+    else:
+        result = tombll_common.query_return_everything("""
+            SELECT
+                Info.trleID,
+                Author.value,
+                Info.title,
+                InfoDifficulty.value,
+                InfoDuration.value,
+                InfoClass.value,
+                InfoType.value,
+                Info.release
+            FROM Info
+            INNER JOIN Level ON (Info.InfoID = Level.infoID)
+            INNER JOIN AuthorList ON (Level.LevelID = AuthorList.levelID)
+            INNER JOIN Author ON (Author.AuthorID = AuthorList.authorID)
+            LEFT JOIN InfoDifficulty ON (InfoDifficulty.InfoDifficultyID = Info.difficulty)
+            LEFT JOIN InfoDuration ON (InfoDuration.InfoDurationID = Info.duration)
+            INNER JOIN InfoType ON (InfoType.InfoTypeID = Info.type)
+            LEFT JOIN InfoClass ON (InfoClass.InfoClassID = Info.class)
+            ORDER BY Info.release ASC
+            LIMIT ? OFFSET ?
+            """, (limit, offset), con)
 
     for row in result:
         level = data_factory.make_trle_level_data()

database/tombll_view.py

@@ -1,10 +1,11 @@
 """Terminal menus, prompts for data, tests and setting up the database."""
-
 import os
 import sqlite3
 
+import shutil
 import tombll_manage_data
 
+size = shutil.get_terminal_size(fallback=(149, 14))
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 
@@ -100,8 +101,13 @@ def _print_trle_page(page):
     print(f"{page['offset'] + len(page['levels'])} of {page['records_total']} records")
     levels = page['levels']
 
+    if size.columns < 149:
+        print("You're scrren is to small")
+        print("Make you font smaller")
+        input("Press Enter see the page")
+
     # Column widths for even spacing
-    column_widths = [6, 20, 70, 17, 11, 16, 6, 10]
+    column_widths = [6, 20, 70, 17, 11, 16, 6, 11]
 
     headers = ["ID", "Author", "Level Name", "Difficulty",
                "Duration", "Class", "Type", "Released"]