Merge pull request #44 from justinhartman/develop

Merge develop into main

Author: justinhartman

README.md

@@ -180,11 +180,9 @@ OMDb API used in this project. Open the file and begin testing the API to see re
 **Would love some help on these...**
 
 - [ ] Work out a way to stop the video player from adding popups when watching[^1].
-- [ ] Change layout to include all episodes on the view screen.
 - [ ] Add personalised recommendations. _(not so easy to do)_
 - [ ] Implement a proper logging mechanism to track errors and user interactions.
 - [ ] Improve the error handling mechanism to provide better feedback to the user when an error occurs.
-- [ ] Complete test suite.
 
 [^1]: This is a product of not hosting your own video content and the video feed providers try monetise through popups. 
 I want a way to kill this because there's known malware in these popups!
@@ -203,6 +201,8 @@ I want a way to kill this because there's known malware in these popups!
   - [x] Bookmarks to save items to profile
 - [x] Add test suite so we can code better.
 - [x] Add code coverage reporting
+- [x] Change layout to include all episodes on the view screen.
+- [x] Complete test suite.
 
 ## License
 

helpers/httpClient.ts

@@ -21,7 +21,7 @@ const httpsAgent = new https.Agent({ keepAlive: false });
  * @property {https.Agent} httpsAgent - HTTPS agent with keep-alive disabled
  */
 const client: AxiosInstance = axios.create({
-  timeout: 10_000,
+  timeout: 10000,
   maxRedirects: 5,
   httpAgent,
   httpsAgent,

migrations/20250825141735-convert-history-fields-to-int.js

@@ -0,0 +1,138 @@
+module.exports = {
+  async up(db) {
+    const COLLECTION = 'histories';
+    const col = db.collection(COLLECTION);
+
+    // If you ever stored season/episode under legacy keys, fold them in first.
+    // This only copies when lastSeason/lastEpisode are missing; then removes the legacy keys.
+    await col.updateMany(
+      { $or: [{ season: { $exists: true } }, { episode: { $exists: true } }] },
+      [
+        {
+          $set: {
+            lastSeason: {
+              $cond: [
+                { $and: [{ $ne: ["$season", null] }, { $or: [{ $eq: ["$lastSeason", null] }, { $not: [{ $gt: ["$lastSeason", null] }] }] }] },
+                "$season",
+                "$lastSeason"
+              ]
+            },
+            lastEpisode: {
+              $cond: [
+                { $and: [{ $ne: ["$episode", null] }, { $or: [{ $eq: ["$lastEpisode", null] }, { $not: [{ $gt: ["$lastEpisode", null] }] }] }] },
+                "$episode",
+                "$lastEpisode"
+              ]
+            }
+          }
+        },
+        { $unset: ["season", "episode"] }
+      ]
+    );
+
+    // Convert strings (and other coercible types) -> int; leave existing numbers as-is.
+    await col.updateMany(
+      {
+        $or: [
+          { lastSeason: { $type: "string" } },
+          { lastEpisode: { $type: "string" } }
+        ]
+      },
+      [
+        {
+          $set: {
+            lastSeason: {
+              $convert: {
+                input: "$lastSeason",
+                to: "int",
+                onError: "$lastSeason", // keep original if not numeric (safety)
+                onNull: "$lastSeason"
+              }
+            },
+            lastEpisode: {
+              $convert: {
+                input: "$lastEpisode",
+                to: "int",
+                onError: "$lastEpisode",
+                onNull: "$lastEpisode"
+              }
+            }
+          }
+        }
+      ]
+    );
+
+    // Optional: also coerce numeric strings that slipped through legacy keys above
+    await col.updateMany(
+      {
+        $or: [
+          { lastSeason: { $type: "double" } },
+          { lastEpisode: { $type: "double" } },
+          { lastSeason: { $type: "long" } },
+          { lastEpisode: { $type: "long" } }
+        ]
+      },
+      [
+        {
+          $set: {
+            lastSeason: {
+              $convert: {
+                input: "$lastSeason",
+                to: "int",
+                onError: "$lastSeason",
+                onNull: "$lastSeason"
+              }
+            },
+            lastEpisode: {
+              $convert: {
+                input: "$lastEpisode",
+                to: "int",
+                onError: "$lastEpisode",
+                onNull: "$lastEpisode"
+              }
+            }
+          }
+        }
+      ]
+    );
+  },
+
+  async down(db) {
+    const COLLECTION = 'histories';
+    const col = db.collection(COLLECTION);
+
+    // Revert ints/longs back to strings (best-effort).
+    await col.updateMany(
+      {
+        $or: [
+          { lastSeason: { $type: "int" } },
+          { lastEpisode: { $type: "int" } },
+          { lastSeason: { $type: "long" } },
+          { lastEpisode: { $type: "long" } }
+        ]
+      },
+      [
+        {
+          $set: {
+            lastSeason: {
+              $convert: {
+                input: "$lastSeason",
+                to: "string",
+                onError: "$lastSeason",
+                onNull: "$lastSeason"
+              }
+            },
+            lastEpisode: {
+              $convert: {
+                input: "$lastEpisode",
+                to: "string",
+                onError: "$lastEpisode",
+                onNull: "$lastEpisode"
+              }
+            }
+          }
+        }
+      ]
+    );
+  }
+};

package.json

@@ -22,6 +22,7 @@
     "db:status": "npx migrate-mongo status",
     "db:migrate": "npx migrate-mongo up",
     "db:rollback": "npx migrate-mongo down",
+    "db:create": "npx migrate-mongo create",
     "publish:patch": "npx grunt",
     "publish:minor": "npx grunt minor",
     "publish:major": "npx grunt major",

public/css/style.css

@@ -21,11 +21,13 @@ a.btn-primary:hover {
     flex-grow: 1;
 }
 
+/* Series video view page. */
 .series-layout {
     display: flex;
     flex-direction: column;
 }
 
+/* Home page scrolling containers with buttons. */
 .scroll-row {
     overflow-x: auto;
     scroll-behavior: smooth;
@@ -35,18 +37,19 @@ a.btn-primary:hover {
 }
 .scroll-button {
     position: absolute;
-    top: 50%;
+    top: 38%;
     transform: translateY(-50%);
     background: rgba(0,0,0,0.5);
     border: none;
     color: #fff;
     padding: 0.5rem;
+    margin: 0 0.5rem;
     z-index: 10;
 }
 .scroll-button.left { left: 0; }
 .scroll-button.right { right: 0; }
 
-/* Styles that apply at the 'md' breakpoint and above */
+/* Styles that apply at the 'md' breakpoint and above. */
 @media (min-width: 768px) {
     .card-img-top {
         height: 360px;

views/index.ejs

@@ -81,7 +81,7 @@
 
     <script>
         document.addEventListener('DOMContentLoaded', () => {
-            document.querySelectorAll('.scroll-button' h-25 rounded-3).forEach(btn => {
+            document.querySelectorAll('.scroll-button').forEach(btn => {
                 btn.addEventListener('click', function() {
                     const container = document.querySelector(this.dataset.target);
                     const amount = container.clientWidth;