GameSentenceMiner 2.17.1__py3-none-any.whl → 2.17.2__py3-none-any.whl

GameSentenceMiner/util/gsm_utils.py

@@ -267,57 +267,3 @@ os.makedirs(os.path.dirname(TEXT_REPLACEMENTS_FILE), exist_ok=True)
 #                 f.write(data)
 #     except Exception as e:
 #         logger.error(f"Failed to fetch JSON from {url}: {e}")
-
-
-# Remove GitHub replacements from local OCR replacements file, these replacements are not needed
-def remove_github_replacements_from_local_ocr():
-    github_url = "https://raw.githubusercontent.com/bpwhelan/GameSentenceMiner/main/electron-src/assets/ocr_replacements.json"
-
-    github_replacements = {}
-    try:
-        response = requests.get(github_url)
-        response.raise_for_status()
-        github_data = response.json()
-        github_replacements = github_data.get('args', {}).get('replacements', {})
-        logger.debug(f"Successfully fetched {len(github_replacements)} replacements from GitHub.")
-    except requests.exceptions.RequestException as e:
-        logger.debug(f"Failed to fetch GitHub replacements from {github_url}: {e}")
-        return
-    except json.JSONDecodeError as e:
-        logger.debug(f"Error decoding JSON from GitHub response: {e}")
-        return
-
-    if not os.path.exists(OCR_REPLACEMENTS_FILE):
-        logger.debug(f"Local file {OCR_REPLACEMENTS_FILE} does not exist. No replacements to remove.")
-        return
-
-    try:
-        with open(OCR_REPLACEMENTS_FILE, 'r', encoding='utf-8') as f:
-            local_ocr_data = json.load(f)
-
-        local_replacements = local_ocr_data.get('args', {}).get('replacements', {})
-        original_count = len(local_replacements)
-        logger.debug(f"Loaded {original_count} replacements from local file.")
-
-        removed_count = 0
-        for key_to_remove in github_replacements.keys():
-            if key_to_remove in local_replacements:
-                del local_replacements[key_to_remove]
-                removed_count += 1
-
-        if removed_count > 0:
-            local_ocr_data['args']['replacements'] = local_replacements
-            with open(OCR_REPLACEMENTS_FILE, 'w', encoding='utf-8') as f:
-                json.dump(local_ocr_data, f, ensure_ascii=False, indent=4)
-            logger.debug(f"Successfully removed {removed_count} replacements from {OCR_REPLACEMENTS_FILE}.")
-            logger.debug(f"Remaining replacements in local file: {len(local_replacements)}")
-        else:
-            logger.debug("No matching replacements from GitHub found in your local file to remove.")
-
-    except json.JSONDecodeError as e:
-        logger.debug(f"Error decoding JSON from {OCR_REPLACEMENTS_FILE}: {e}. Please ensure it's valid JSON.")
-    except Exception as e:
-        logger.debug(f"An unexpected error occurred while processing {OCR_REPLACEMENTS_FILE}: {e}")
-
-
-remove_github_replacements_from_local_ocr()

GameSentenceMiner/web/database_api.py

@@ -795,9 +795,20 @@ def register_database_api_routes(app):
         punctionation_regex = regex.compile(r'[\p{P}\p{S}\p{Z}]')
         # Get optional year filter parameter
         filter_year = request.args.get('year', None)
+
+        # Get Start and End time as unix timestamp
+        start_timestamp = request.args.get('start', None)
+        end_timestamp = request.args.get('end', None)
         
+        # Convert timestamps to float if provided
+        start_timestamp = float(start_timestamp) if start_timestamp else None
+        end_timestamp = float(end_timestamp) if end_timestamp else None
+
+        # # 1. Fetch all lines and sort them chronologically
+        # all_lines = sorted(GameLinesTable.all(), key=lambda line: line.timestamp)
+
         # 1. Fetch all lines and sort them chronologically
-        all_lines = sorted(GameLinesTable.all(), key=lambda line: line.timestamp)
+        all_lines = GameLinesTable.get_lines_filtered_by_timestamp(start=start_timestamp, end=end_timestamp)
         
         if not all_lines:
             return jsonify({"labels": [], "datasets": []})

GameSentenceMiner/web/gsm_websocket.py

@@ -78,7 +78,7 @@ class WebsocketServerThread(threading.Thread):
             while True:
                 try:
                     self.server = start_server = websockets.serve(self.server_handler,
-                                                                  "0.0.0.0",
+                                                                  get_config().advanced.localhost_bind_address,
                                                                   self.get_ws_port_func(),
                                                                   max_size=1000000000)
                     async with start_server:

GameSentenceMiner/web/static/css/shared.css

@@ -929,4 +929,24 @@ h1 {
     .games-table td:nth-child(6) {
         display: none;
     }
+}
+
+input[type="date"].dashboard-date-input {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+    transition: all 0.2s ease; /* smooth animation */
+    border-radius: 8px;
+    border: 1px solid var(--border-color);
+    padding: 8px 12px;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text-primary);
+    background: var(--bg-tertiary);
+    cursor: pointer;
+}
+
+input[type="date"].dashboard-date-input:focus,
+input[type="date"].dashboard-date-input:hover {
+    border-color: var(--accent-color);
+    box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.15);
+    outline: none;
 }

GameSentenceMiner/web/static/css/stats.css

@@ -657,6 +657,440 @@
     margin-bottom: 16px;
 }
 
+/* ================================
+   Dashboard Cards Styles
+================================ */
+.dashboard-container {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
+    gap: 30px;
+    margin-bottom: 40px;
+}
+
+.dashboard-card {
+    background: var(--bg-secondary);
+    border-radius: 12px;
+    box-shadow: 0 4px 16px var(--shadow-color);
+    border: 1px solid var(--border-color);
+    padding: 24px;
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+}
+
+.dashboard-card:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 8px 24px var(--shadow-color);
+}
+
+.dashboard-card::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 4px;
+    background: linear-gradient(90deg, var(--accent-color), var(--success-color));
+    border-radius: 12px 12px 0 0;
+}
+
+.dashboard-card.current-game::before {
+    background: linear-gradient(90deg, var(--accent-color), var(--info-color));
+}
+
+.dashboard-card.all-games::before {
+    background: linear-gradient(90deg, var(--success-color), var(--warning-color));
+}
+
+.dashboard-card.date-range::before {
+    background: linear-gradient(90deg, var(--info-color), var(--accent-color));
+}
+
+.dashboard-card.date-range {
+    margin-bottom: 30px;
+}
+
+.dashboard-card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+}
+
+.dashboard-card-title {
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--text-primary);
+    margin: 0;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+.dashboard-card-icon {
+    font-size: 24px;
+    opacity: 0.8;
+}
+
+.dashboard-card-subtitle {
+    font-size: 14px;
+    color: var(--text-tertiary);
+    margin: 4px 0 0 0;
+}
+
+/* ================================
+   Stats Grid
+================================ */
+.dashboard-stats-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
+    gap: 16px;
+    margin-bottom: 20px;
+}
+
+.dashboard-stat-item {
+    text-align: center;
+    padding: 12px;
+    background: var(--bg-tertiary);
+    border-radius: 8px;
+    transition: all 0.2s ease;
+    position: relative;
+    cursor: pointer;
+}
+
+.dashboard-stat-item:hover {
+    background: var(--border-color);
+    transform: scale(1.02);
+}
+
+.dashboard-stat-value {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--text-primary);
+    margin-bottom: 4px;
+    display: block;
+}
+
+.dashboard-stat-label {
+    font-size: 12px;
+    color: var(--text-tertiary);
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    font-weight: 500;
+}
+
+/* ================================
+   Progress Section
+================================ */
+.dashboard-progress-section {
+    margin-top: 20px;
+    padding-top: 20px;
+    border-top: 1px solid var(--border-color);
+}
+
+.dashboard-progress-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--text-secondary);
+    margin-bottom: 12px;
+}
+
+.dashboard-progress-items {
+    display: flex;
+    justify-content: space-between;
+    gap: 16px;
+}
+
+.dashboard-progress-item {
+    text-align: center;
+    flex: 1;
+}
+
+.dashboard-progress-value {
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 4px;
+}
+
+.dashboard-progress-value.positive {
+    color: var(--success-color);
+}
+
+.dashboard-progress-value.neutral {
+    color: var(--text-secondary);
+}
+
+.dashboard-progress-label {
+    font-size: 11px;
+    color: var(--text-tertiary);
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+}
+
+/* ================================
+   Streak Indicator
+================================ */
+.dashboard-streak-indicator {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 12px;
+    color: var(--success-color);
+    background: rgba(40, 167, 69, 0.1);
+    padding: 4px 8px;
+    border-radius: 12px;
+    font-weight: 500;
+}
+
+.dashboard-streak-indicator::before {
+    content: '🔥';
+    font-size: 14px;
+}
+
+/* ================================
+   Date Range Card
+================================ */
+.dashboard-date-range {
+    display: flex;
+    gap: 20px;
+}
+
+.dashboard-date-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+}
+
+.dashboard-date-item label {
+    font-size: 13px;
+    color: var(--text-secondary);
+    font-weight: 500;
+}
+
+.dashboard-date-input {
+    padding: 8px 12px;
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    background: var(--bg-tertiary);
+    color: var(--text-primary);
+    font-size: 14px;
+    transition: all 0.2s ease;
+}
+
+.dashboard-date-input:focus {
+    outline: none;
+    border-color: var(--accent-color);
+    box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.15);
+}
+
+/* ================================
+   Tooltip Styles
+================================ */
+.tooltip {
+    position: relative;
+    cursor: help;
+}
+
+.tooltip::before {
+    content: attr(data-tooltip);
+    position: absolute;
+    bottom: 125%;
+    left: 50%;
+    transform: translateX(-50%);
+    background: rgba(0, 0, 0, 0.9);
+    color: white;
+    padding: 8px 12px;
+    border-radius: 6px;
+    font-size: 12px;
+    white-space: nowrap;
+    opacity: 0;
+    visibility: hidden;
+    transition: all 0.3s ease;
+    z-index: 1000;
+    pointer-events: none;
+}
+
+.tooltip::after {
+    content: '';
+    position: absolute;
+    bottom: 120%;
+    left: 50%;
+    transform: translateX(-50%);
+    border: 4px solid transparent;
+    border-top-color: rgba(0, 0, 0, 0.9);
+    opacity: 0;
+    visibility: hidden;
+    transition: all 0.3s ease;
+    z-index: 1000;
+}
+
+.tooltip:hover::before,
+.tooltip:hover::after {
+    opacity: 1;
+    visibility: visible;
+}
+
+/* ================================
+   Loading State
+================================ */
+.dashboard-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 200px;
+    color: var(--text-tertiary);
+}
+
+.dashboard-loading .spinner {
+    margin-right: 10px;
+}
+
+/* ================================
+   Error State
+================================ */
+.dashboard-error {
+    text-align: center;
+    padding: 40px 20px;
+    color: var(--danger-color);
+}
+
+.dashboard-error-icon {
+    font-size: 48px;
+    margin-bottom: 16px;
+    opacity: 0.7;
+}
+
+.dashboard-error-message {
+    font-size: 16px;
+    margin-bottom: 16px;
+}
+
+.dashboard-retry-btn {
+    background-color: var(--accent-color);
+    color: white;
+    border: none;
+    padding: 10px 20px;
+    border-radius: 6px;
+    cursor: pointer;
+    font-size: 14px;
+    transition: all 0.3s ease;
+}
+
+.dashboard-retry-btn:hover {
+    background-color: #0056b3;
+    transform: translateY(-1px);
+}
+
+/* ================================
+   Popups
+================================ */
+.dashboard-popup,
+.no-data-popup {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 2000;
+}
+
+.hidden {
+    display: none;
+}
+
+.dashboard-popup-content,
+.no-data-content {
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 12px;
+    padding: 24px;
+    box-shadow: 0 8px 24px var(--shadow-color);
+    text-align: center;
+    max-width: 400px;
+    width: 90%;
+}
+
+.dashboard-popup-icon {
+    font-size: 32px;
+    margin-bottom: 12px;
+}
+
+.dashboard-popup-message,
+.no-data-content p {
+    font-size: 14px;
+    color: var(--text-primary);
+    margin-bottom: 20px;
+}
+
+.dashboard-popup-btn,
+#closeNoDataPopup {
+    background: var(--accent-color);
+    color: white;
+    border: none;
+    padding: 10px 18px;
+    border-radius: 8px;
+    font-size: 14px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.dashboard-popup-btn:hover,
+#closeNoDataPopup:hover {
+    background: #0056b3;
+    transform: translateY(-1px);
+}
+
+/* Popup box */
+.dashboard-popup-content {
+    background: var(--bg-secondary);
+    border-radius: 12px;
+    box-shadow: 0 8px 24px var(--shadow-color);
+    border: 1px solid var(--border-color);
+    padding: 24px;
+    max-width: 320px;
+    text-align: center;
+    animation: popupFadeIn 0.3s ease;
+}
+
+.dashboard-popup-icon {
+    font-size: 36px;
+    margin-bottom: 12px;
+}
+
+.dashboard-popup-message {
+    font-size: 14px;
+    color: var(--danger-color);
+    margin-bottom: 20px;
+    font-weight: 500;
+}
+
+.dashboard-popup-btn {
+    padding: 10px 16px;
+    border-radius: 6px;
+    border: none;
+    background: var(--accent-color);
+    color: #fff;
+    font-size: 14px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.dashboard-popup-btn:hover {
+    background: var(--accent-color-hover, #0056b3);
+    transform: translateY(-1px);
+}
+
+@keyframes popupFadeIn {
+    from { transform: scale(0.95); opacity: 0; }
+    to { transform: scale(1); opacity: 1; }
+}
+
 /* Responsive Design for Goal Progress Chart */
 @media (max-width: 768px) {
     .goal-progress-grid {
@@ -739,4 +1173,65 @@
         margin-left: 0;
         align-self: center;
     }
-}
+}
+
+/* Responsive adjustments */
+@media (max-width: 768px) {
+    .dashboard-date-range {
+        flex-direction: column;
+        gap: 12px;
+        padding: 12px 16px;
+    }
+
+    .dashboard-date-item {
+        width: 100%;
+    }
+
+    .dashboard-fetch-btn {
+        width: 100%;
+    }
+}
+
+
+.no-data-popup {
+    position: fixed;
+    inset: 0;
+    background: rgba(0,0,0,0.6);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 2000;
+}
+
+.no-data-popup.hidden {
+    display: none;
+}
+
+.no-data-content {
+    background: var(--bg-secondary);
+    padding: 20px 30px;
+    border-radius: 10px;
+    text-align: center;
+    box-shadow: 0 4px 12px rgba(0,0,0,0.3);
+}
+
+.no-data-content p {
+    margin-bottom: 16px;
+    color: var(--text-primary);
+    font-size: 15px;
+}
+
+.no-data-content button {
+    padding: 8px 16px;
+    background: var(--accent-color);
+    border: none;
+    border-radius: 6px;
+    color: #fff;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.no-data-content button:hover {
+    background: #0056b3;
+}