Non-substantive changes per recommendations

MMM-MyScoreboard.js

@@ -1,6 +1,6 @@
 /*********************************
 
- Magic Mirror Module:
+ MagicMirror² Module:
  MMM-MyScoreboard
  https://github.com/jclarke0000/MMM-MyScoreboard
 
@@ -16,6 +16,7 @@ Module.register("MMM-MyScoreboard",{
     showLeagueSeparators: true,
     colored: true,
     rolloverHours: 3, //hours past midnight to show the pervious day's scores
+    alwaysShowToday: false, //show BOTH today and yesterday during rolloverHours
     shadeRows: false,
     highlightWinners: true,
     viewStyle: "largeLogos",
@@ -520,7 +521,7 @@ Module.register("MMM-MyScoreboard",{
     */
     if (!this.loaded) {
       var loadingText = document.createElement("div");
-      loadingText.innerHTML = this.translate("LOADING");
+      loadingText.innerHTML = this.translate("LOADING MYSCOREBOARD");
       loadingText.className = "dimmed light small";
       wrapper.appendChild(loadingText);
       return wrapper;
@@ -552,6 +553,24 @@ Module.register("MMM-MyScoreboard",{
           wrapper.appendChild(boxScore);
         });
       }
+      if (self.sportsDataYd[index] != null && self.sportsDataYd[index].length > 0 && self.config.alwaysShowToday) {
+        anyGames = true;
+        if (self.config.showLeagueSeparators) {
+          var leagueSeparator = document.createElement("div");
+          leagueSeparator.classList.add("league-separator");
+          if (sport.label) {
+            leagueSeparator.innerHTML = "<span>" + sport.label + " - Yesterday</span>";
+          } else {
+            leagueSeparator.innerHTML = "<span>" + sport.league + " - Yesterday</span>";
+          }
+          wrapper.appendChild(leagueSeparator);
+        }
+        self.sportsDataYd[index].forEach(function(game, gidx) {
+          var boxScore = self.boxScoreFactory(sport.league, game);
+          boxScore.classList.add(gidx % 2 == 0 ? "odd" : "even") ;
+          wrapper.appendChild(boxScore);
+        });
+      }
     });
 
     /*
@@ -572,10 +591,15 @@ Module.register("MMM-MyScoreboard",{
 
   socketNotificationReceived: function(notification, payload) {
     if ( notification === "MMM-MYSCOREBOARD-SCORE-UPDATE" && payload.instanceId == this.identifier) {
-      console.log("[MMM-MyScoreboard] Updating Scores");
+      Log.info("[MMM-MyScoreboard] Updating Scores");
       this.loaded = true;
       this.sportsData[payload.index] = payload.scores;
       this.updateDom();
+    } else if ( notification === "MMM-MYSCOREBOARD-SCORE-UPDATE-YD" && payload.instanceId == this.identifier && this.config.alwaysShowToday ) {
+      Log.info("[MMM-MyScoreboard] Updating Yesterday's Scores");
+      this.loaded = true;
+      this.sportsDataYd[payload.index] = payload.scores;
+      this.updateDom();
     } else if (notification === "MMM-MYSCOREBOARD-LOCAL-LOGO-LIST" && payload.instanceId == this.identifier) {
       this.localLogos = payload.logos;
 
@@ -599,7 +623,6 @@ Module.register("MMM-MyScoreboard",{
         this.getScores();
       }, 2 * 60 * 1000);
 
-
     }
   },
 
@@ -625,6 +648,7 @@ Module.register("MMM-MyScoreboard",{
 
     this.loaded = false;
     this.sportsData = new Array();
+    this.sportsDataYd = new Array();
 
     if (this.viewStyles.indexOf(this.config.viewStyle) == -1) {
       this.config.viewStyle = "largeLogos";
@@ -661,7 +685,6 @@ Module.register("MMM-MyScoreboard",{
       }
     }
 
-
     if (teamList.length == 0) {
       return null;
     }
@@ -672,6 +695,7 @@ Module.register("MMM-MyScoreboard",{
   getScores: function() {
 
     var gameDate = moment(); //get today's date
+    var whichDay = 'one';
 
     if (gameDate.hour() < this.config.rolloverHours) {
       /*
@@ -680,6 +704,9 @@ Module.register("MMM-MyScoreboard",{
         not today's
       */
       gameDate.subtract(1, "day");
+      if (this.config.alwaysShowToday) {
+        whichDay = 'both';
+      }
     }
 
     //just used for debug, if you want to force a specific date
@@ -696,16 +723,14 @@ Module.register("MMM-MyScoreboard",{
         league: sport.league,
         teams: self.makeTeamList(self, sport.league, sport.teams, sport.groups),
         provider: self.supportedLeagues[sport.league].provider,
-        gameDate: gameDate
+        gameDate: gameDate,
+        whichDay: whichDay
       };
 
       self.sendSocketNotification("MMM-MYSCOREBOARD-GET-SCORES", payload);
-
-
+
     });
 
-
-
   },
 
   /*
@@ -924,4 +949,4 @@ Module.register("MMM-MyScoreboard",{
 
   }
 
-});
+});

README.md

@@ -1,8 +1,8 @@
 # MMM-MyScoreboard
 
-This a module for <strong>MagicMirror</strong><br>
+This a module for **MagicMirror**<br>
 https://magicmirror.builders/<br>
-https://github.com/MichMich/MagicMirror
+https://github.com/MagicMirrorOrg/MagicMirror
 
 This module displays today's scores for your favourite teams across a number of different
 leagues, including:
@@ -29,127 +29,58 @@ leagues, including:
   * Spanish La Liga
   * Mexican Liga BBVA Bancomer
 
-## UPDATE RELEASE 3.0 9-OCT-2022
-
-This update includes several addtions and fixes:
-* Correction of SportsNet provider ticker URL
-* Change of ESPN provider to HTTPS
-* Replacement of deprecated library Request with Axios
-* Addition of WNBA and NCAAW womens' basketball
-* Update of logos for North American leagues
-* Correction of Winsconsin Badgers NCAA team shortcode from WIS to WISC
-* Improves how team logos are handled.  Uses local logo files where available, otherwises uses URL from feed.
-
-If you are upgrading from a previous version, this update introduces new libraries. Upgrade as follows:
-In the MMM-MyScoreboard directory, type:
-
-`git pull`
-followed by
-`npm install`
-
-
 ![Screenshot](/../screenshots/MMM-MyScoreboard-screenshot.png?raw=true "Screenshot")
 
 
 ## Installation
 
-1. Navigate into your MagicMirror `modules` folder and execute<br>
-`git clone https://github.com/jclarke0000/MMM-MyScoreboard`.
-2. Enter the new `MMM-MyScoreboard` directory and execute `npm install`.
-
-
-## Notice to anyone updating from previous versions
+```sh
+cd ~/MagicMirror/modules
+git clone https://github.com/dathbe/MMM-MyScoreboard
+cd MMM-MyScoreboard
+npm install
+```
 
-1. Run `git pull` in the `MMM-MyScoreboard` directory to get the latest source code. If you are not seeing the latest update, then try deleting your `MMM-MyScoreboard` directory and reclone it as per the initial installation instructions above.
-2. Still in the `MMM-MyScoreboard` directory, run `npm install`.
-3. (Optional) Run `npm prune` to remove some packages that are no longer needed.
-4. As the providers have changed for most sports, some of the team shortcodes are different. If you're not seeing your team show up even though you know a game is scheduled, check your config against the list of team shortcodes below.
+## Update
 
+```sh
+cd ~/MagicMirror/modules/MMM-MyScoreboard
+git pull
+npm install
+```
 
 ## Configuration
 
-<table>
-  <thead>
-    <tr>
-      <th>Option</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><code>showLeagueSeparators</code></td>
-      <td>Whether to show separators between different leagues.<br><br><strong>Type</strong> <code>Boolean</code><br>Defaults to <code>true</code></td>
-    </tr>
-    <tr>
-      <td><code>colored</code></td>
-      <td>Whether to present module in colour or black-and-white.<br><br><strong>Type</strong> <code>Boolean</code><br>Defaults to <code>true</code></td>
-    </tr>
-    <tr>
-      <td><code>rolloverHours</code></td>
-      <td>How many hours past midnight to continue to show the previous day's games.<br><br><strong>Type</strong> <code>Number</code><br>Defaults to <code>3</code> (i.e.: continue to show yesterday's games until 3:00 AM)</td>
-    </tr>
-    <tr>
-      <td><code>viewStyle</code></td>
-      <td>One of the following: <code>largeLogos</code>, <code>mediumLogos</code>, <code>smallLogos</code>, <code>oneLine</code>, <code>oneLineWithLogos</code>, <code>stacked</code> or <code>stackedWithLogos</code>.<br><br><strong>Type</strong> <code>String</code><br>Defaults to <code>largeLogos</code><br />See below for examples of the view styles.</td>
-    </tr>
-    <tr>
-      <td><code>shadeRows</code></td>
-      <td>Whether to shade alternate rows.<br><br><strong>Type</strong> <code>Boolean</code><br>Defaults to <code>false</code></td>
-    </tr>
-    <tr>
-      <td><code>highlightWinners</code></td>
-      <td>For games that are final, the winning team / score is highlighted.<br><br><strong>Type</strong> <code>Boolean</code><br>Defaults to <code>true</code></td>
-    </tr>
-    <tr>
-      <td><code>showRankings</code></td>
-      <td>For the NCAAF and NCAAM, whether to show the rankings for the top 25 teams.<br><br><strong>Type</strong> <code>Boolean</code><br>Defaults to <code>true</code></td>
-    </tr>
-    <tr>
-      <td><code>sports</code></td>
-      <td><strong>REQUIRED</strong> An array of leagues and teams you wish to follow.<br><br><strong>Type</strong> <code>Array</code><br>See below for instructions to configure your <code>sports</code> list.</td>
-    </tr>
-  </tbody>
-</table>
-
+| Option                 | Description
+|----------------------- |------------
+| `showLeagueSeparators` | Whether to show separators between different leagues.<br><br>**Type** `Boolean`<br>**Default** `true`
+| `colored`              | Whether to present module in colour or black-and-white.<br><br>**Type** `Boolean`<br>**Default** `true`
+| `rolloverHours`        | How many hours past midnight to continue to show the previous day's games.<br><br>**Type** `Number`<br>**Default** `3` (i.e.: continue to show yesterday's games until 3:00 AM)
+| `alwaysShowToday`      | Whether to show today's games _along with_ the previous day's games during `rolloverHours` period.<br><br>**Type** `Boolean`<br>**Default** `false`
+| `viewStyle`            | One of the following: `largeLogos`, `mediumLogos`, `smallLogos`, `oneLine`, `oneLineWithLogos`, `stacked` or `stackedWithLogos`.<br>See below for examples of the view styles.<br><br>**Type** `String`<br>**Default** `largeLogos`
+| `shadeRows`            | Whether to shade alternate rows.<br><br>**Type** `Boolean`<br>**Default** `false`
+| `highlightWinners`     | For games that are final, the winning team / score is highlighted.<br><br>**Type** `Boolean`<br>**Default** `true`
+| `showRankings`         | For the NCAAF and NCAAM, whether to show the rankings for the top 25 teams.<br><br>**Type** `Boolean`<br>**Default** `true`
+| `sports`               | **REQUIRED** An array of leagues and teams you wish to follow.<br>See below for instructions to configure your `sports` list.<br><br>**Type** `Array`
 
 
 ## Configuring your sports list
 
 Each entry in your `sports` array is an object with the following properties:
 
-<table>
-  <thead>
-    <tr>
-      <th>Property</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><code>league</code></td>
-      <td><strong>REQUIRED</strong> e.g.: <code>"NHL"</code>. Use any of the bold, uppercase league labaels from the list bleow.<br><br><strong>Type</strong> <code>String</code></td>
-    </tr>
-    <tr>
-      <td><code>label</code></td>
-      <td>If <code>showLeagueSeparators</code> is set to <code>true</code>, you can optionally set a custom label for the separator. Useful in particular to show something other than <code>"NCAAM_MM"</code> for the March Madness tournament.<br><br><strong>Type</strong> <code>String</code><br />Defaults to the value for <code>league</code>.</td>
-    </tr>
-    <tr>
-      <td><code>teams</code></td>
-      <td>An array of teams for which you want to see scores.  Specify teams using their shortcodes (e.g.: <code>"TOR"</code> for Toronto Maple Leafs.<br><br><strong>Type</strong> <code>Array</code><br>See below for a full listing of teams and their short codes<br><br><strong>UPDATE v2.0:</strong> This is no longer required.</td>
-    </tr>
-    <tr>
-      <td><code>groups</code></td>
-      <td>In addition to specifying individual teams, you may also specify groups.  Generally these groups correspond to the league's respective conferences and divisions.  See below for a full listing of groups available for each league. (e.g.: <code>["Atlantic", "Metropolitain"]</code> for teams in the Atlantic and Metropolitain divisions.<br><br><strong>Type</strong> <code>Array</code></td>
-    </tr>
-  </tbody>
-</table>
-
-It should be noted that if you specify arrays for both <code>teams</code> and <code>groups</code> they will be added together.  So it's possible to make a team list out of a division and a few other specific teams.  If you omit both parameters, then all games for the particular league will be shown.
+| Property   | Description
+|----------- |------------
+| `league`   | **REQUIRED** e.g.: `"NHL"`. Use any of the bold, uppercase league labaels from the list bleow.<br><br>**Type** `String`
+| `label`    | If `showLeagueSeparators` is set to `true`, you can optionally set a custom label for the separator. Useful in particular to show something other than `"NCAAM_MM"` for the March Madness tournament.<br><br>**Type** `String`<br />**Default** the value for `league`.
+| `teams`    | An array of teams for which you want to see scores.  Specify teams using their shortcodes (e.g.: `"TOR"` for Toronto Maple Leafs.<br>See below for a full listing of teams and their short codes<br><br>**Type** `Array`<br>**UPDATE v2.0:** This is no longer required.
+| `groups`   | In addition to specifying individual teams, you may also specify groups.  Generally these groups correspond to the league's respective conferences and divisions.  See below for a full listing of groups available for each league. (e.g.: `["Atlantic", "Metropolitain"]` for teams in the Atlantic and Metropolitain divisions.<br><br>**Type** `Array`
+
+It should be noted that if you specify arrays for both `teams` and `groups` they will be added together.  So it's possible to make a team list out of a division and a few other specific teams.  If you omit both parameters, then all games for the particular league will be shown.
 
 
 ## Example configuration
 
-```
+```js
 {
   module: "MMM-MyScoreboard",
   position: "top_right",
@@ -494,7 +425,7 @@ STL   St. Louis Cardinals
 TB    Tampa Bay Rays
 TEX   Texas Rangers
 TOR   Toronto Blue Jays
-WAS   Washington Nationals
+WSH   Washington Nationals
 
 Groups:
 ---------------
@@ -616,7 +547,7 @@ SEA   Seattle Seahawks
 SF    San Francisco 49ers
 TB    Tampa Bay Buccaneers
 TEN   Tennessee Titans
-WAS   Washington
+WSH   Washington
 
 Groups:
 ---------------
@@ -1646,3 +1577,6 @@ Sun Belt
 West Coast
 WAC
 ```
+
+## Thank You
+A special thanks goes to [@jclarke0000](https://github.com/jclarke0000/), who was the original author of this module and wrote most of the code.

node_helper.js

@@ -1,6 +1,6 @@
 const NodeHelper = require("node_helper");
 const dirTree = require("directory-tree");
-
+const moment = require("moment-timezone");
 
 module.exports = NodeHelper.create({
 
@@ -10,6 +10,7 @@ module.exports = NodeHelper.create({
     console.log("Starting node_helper for module [" + this.name + "]");
 
     this.providers.SNET = require("./providers/SNET.js");
+    this.providers.SNET_YD = require("./providers/SNET_YD.js");
     this.providers.ESPN = require("./providers/ESPN.js");
     this.localLogos = {};
 
@@ -45,11 +46,24 @@ module.exports = NodeHelper.create({
 
       var self = this;
       var provider = this.providers[payload.provider];
-
-      provider.getScores(payload.league, payload.teams, payload.gameDate, function(scores) {
-        self.sendSocketNotification("MMM-MYSCOREBOARD-SCORE-UPDATE", {instanceId: payload.instanceId, index: payload.index, scores: scores});
-      });
-
+      var provider2 = this.providers[payload.provider];
+      if (payload.provider == "SNET") {
+        provider2 = this.providers["SNET_YD"];
+      }
+
+        if (payload.whichDay == 'both') {
+          provider.getScores(payload.league, payload.teams, moment(), function(scores) {
+            self.sendSocketNotification("MMM-MYSCOREBOARD-SCORE-UPDATE", {instanceId: payload.instanceId, index: payload.index, scores: scores});
+            });
+          provider2.getScores(payload.league, payload.teams, moment().subtract(1, "day"), function(scores) {
+            self.sendSocketNotification("MMM-MYSCOREBOARD-SCORE-UPDATE-YD", {instanceId: payload.instanceId, index: payload.index, scores: scores});
+            });
+        } else {
+          provider.getScores(payload.league, payload.teams, payload.gameDate, function(scores) {
+            self.sendSocketNotification("MMM-MYSCOREBOARD-SCORE-UPDATE", {instanceId: payload.instanceId, index: payload.index, scores: scores});
+            });
+          self.sendSocketNotification("MMM-MYSCOREBOARD-SCORE-UPDATE-YD", {instanceId: payload.instanceId, index: payload.index, scores: {}});
+        }
 
     } else if (notification == "MMM-MYSCOREBOARD-GET-LOCAL-LOGOS") {
 
@@ -62,4 +76,4 @@ module.exports = NodeHelper.create({
 
 
 
-});
+});