mlbserver 2025.4.2 → 2025.4.5

package/README.md

@@ -43,7 +43,7 @@ After launching the server or Docker container, you can access it at http://loca
 Basic command line or Docker environment options:
 
 ```
---port or -p (primary port to run on; defaults to 9999 if not specified)
+--port or -p (primary port to run on; defaults to 9999 in Docker or if not specified)
 --debug or -d (false if not specified)
 --version or -v (returns package version number)
 --logout or -l (logs out and clears session)
@@ -74,7 +74,7 @@ Advanced command line or Docker environment options:
 
 Supports [SWAG](https://docs.linuxserver.io/general/swag/#preset-proxy-confs) using the custom [mlbserver.subfolder.conf](https://github.com/tonywagner/mlbserver/blob/master/mlbserver.subfolder.conf) file.
 
-For multiview, the default software encoder is limited by your CPU. You may want to experiment with different ffmpeg hardware encoders. "h264_videotoolbox" is confirmed to work on supported Macs, and "h264_v4l2m2m" is confirmed to work on a Raspberry Pi 4 (and likely other Linux systems) when ffmpeg is compiled with this patch: https://www.raspberrypi.org/forums/viewtopic.php?p=1780625#p1780625
+For multiview, the default software video encoder is limited by your CPU. You may want to experiment with different ffmpeg hardware video encoders. "h264_videotoolbox" is confirmed to work on supported Macs, and "h264_v4l2m2m" is confirmed to work on a Raspberry Pi 4 (and likely other Linux systems) when ffmpeg is compiled with this patch: https://www.raspberrypi.org/forums/viewtopic.php?p=1780625#p1780625
 
 More potential hardware encoders are described at https://stackoverflow.com/a/50703794
 

package/index.js

@@ -1564,6 +1564,7 @@ app.get('/', async function(req, res) {
     var thislink = http_root + '/' + link
 
     let blackouts = {}
+    let pre_post_shows = {}
 
     let currentDate = new Date()
 
@@ -1646,6 +1647,13 @@ app.get('/', async function(req, res) {
       session.debuglog('SNY detect error : ' + e.message)
     }
 
+    if ( cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
+      blackouts = await session.get_blackout_games(cache_data.dates[0].date, true)
+      if ( gameDate >= today ) {
+        pre_post_shows = await session.get_pre_post_shows(cache_data.dates[0].date)
+      }
+    }
+
     if ( (mediaType == 'MLBTV') && ((level_ids == levels['MLB']) || level_ids.startsWith(levels['MLB'] + ',')) ) {
       // Recap Rundown beginning in 2023, disabled because it stopped working
       /*if ( (gameDate <= yesterday) && (gameDate >= '2023-03-31') && cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
@@ -1661,13 +1669,9 @@ app.get('/', async function(req, res) {
         body += '</td></tr>' + "\n"
       }*/
 
-      if ( cache_data.dates && cache_data.dates[0] && cache_data.dates[0].games && (cache_data.dates[0].games.length > 0) ) {
-        blackouts = await session.get_blackout_games(cache_data.dates[0].date, true)
-      }
-
       // Big Inning
       var big_inning
-      if ( cache_data.dates && cache_data.dates[0] && (cache_data.dates[0].date >= today) && cache_data.dates[0].games && (cache_data.dates[0].games.length > 1) && cache_data.dates[0].games[0] && (cache_data.dates[0].games[0].seriesDescription == 'Regular Season') ) {
+      if ( (entitlements.length > 0) && cache_data.dates && cache_data.dates[0] && (cache_data.dates[0].date >= today) && cache_data.dates[0].games && (cache_data.dates[0].games.length > 1) && cache_data.dates[0].games[0] && (cache_data.dates[0].games[0].seriesDescription == 'Regular Season') ) {
         // Scraped Big Inning schedule
         big_inning = await session.getBigInningSchedule(gameDate)
 
@@ -2026,9 +2030,16 @@ app.get('/', async function(req, res) {
                       }
                     }
                     let station = broadcast.callSign
+                    
+                    if ( pre_post_shows.pregame_shows && pre_post_shows.pregame_shows[broadcast.mediaId] ) {
+                      station = '/' + station
+                    }
+                    if ( pre_post_shows.postgame_shows && pre_post_shows.postgame_shows[broadcast.mediaId] ) {
+                      station += '/'
+                    }
 
                     // display blackout tooltip, if necessary
-                    if ( blackouts[gamePk] ) {
+                    if ( blackouts[gamePk] && blackouts[gamePk].blackout_feeds && blackouts[gamePk].blackout_feeds.includes(broadcast.mediaId) ) {
                       body += '<span class="tooltip"><span class="blackout">' + teamabbr + '</span><span class="tooltiptext">' + blackouts[gamePk].blackout_type
                       if ( blackouts[gamePk].blackout_type != 'Not entitled' ) {
                         body += ' video blackout until approx. 2.5 hours after the game'
@@ -2083,7 +2094,7 @@ app.get('/', async function(req, res) {
                         multiviewquerystring += content_protect_b
                         stationlink = '<a' + fav_style + ' href="' + thislink + querystring + '">' + station + '</a>'
 
-                        if ( blackouts[gamePk] ) {
+                        if ( blackouts[gamePk] && blackouts[gamePk].blackout_feeds && blackouts[gamePk].blackout_feeds.includes(broadcast.mediaId) ) {
                           body += '<span class="blackout">' + stationlink + '</span>'
                         } else {
                           body += stationlink
@@ -2124,7 +2135,7 @@ app.get('/', async function(req, res) {
                         body += '<a' + fav_style + ' href="https://www.youtube.com/watch?v=' + cache_data.dates[0].games[j].content.media.epg[k].items[x].youtube.videoId + '" target="_blank">' + station + '&UpperRightArrow;</a>'
                       }*/
                     } else {
-                      if ( blackouts[gamePk] ) {
+                      if ( blackouts[gamePk] && blackouts[gamePk].blackout_feeds && blackouts[gamePk].blackout_feeds.includes(broadcast.mediaId) ) {
                         body += '<s>' + station + '</s>'
                       } else {
                         body += station
@@ -2151,7 +2162,14 @@ app.get('/', async function(req, res) {
     body += "</table>" + "\n"
 
     if ( (Object.keys(blackouts).length > 0) ) {
-      body += '<span class="tooltip tinytext"><span class="blackout">strikethrough</span> indicates a live blackout or non-entitled video<span class="tooltiptext">Tap or hover over the team abbreviation to see an estimate of when the blackout will be lifted (officially ~90 minutes, but more likely ~150 minutes or ~2.5 hours after the game ends).</span></span>' + "\n"
+      body += '<span class="tooltip tinytext"><span class="blackout">strikethrough</span> indicates a live blackout or non-entitled content<span class="tooltiptext">Tap or hover over the team abbreviation to see an estimate of when the blackout will be lifted (officially ~90 minutes, but more likely ~150 minutes or ~2.5 hours after the game ends).</span></span>' + "\n"
+      if ( (Object.keys(pre_post_shows).length > 0) ) {
+        body += '<br/>'
+      }
+    }
+
+    if ( (pre_post_shows.pregame_shows && (Object.keys(pre_post_shows.pregame_shows).length > 0)) || (pre_post_shows.postgame_shows && (Object.keys(pre_post_shows.postgame_shows).length > 0)) ) {
+      body += '<span class="tooltip tinytext">/slashes/ indicates a live pre- and/or post-game show<span class="tooltiptext">A /slash before the station indicates a pre-game show; a slash/ after the station indicates a post-game show. Pre- and post-game shows are only available live.</span></span>' + "\n"
       if ( argv.free ) {
         body += '<br/>'
       }
@@ -2179,7 +2197,7 @@ app.get('/', async function(req, res) {
         }
         body += '</p>' + "\n"
 
-        body += '<p><span class="tooltip">Audio<span class="tooltiptext">For video streams only: you can manually specifiy which audio track to include. Some media players can accept them all and let you choose. Not all tracks are available for all games, and injected tracks (away radio for national games, for example) may not work with skip options below.<br/><br/>If you select "none" for video above, picking an audio track here will make it an audio-only feed that supports the inning start and skip breaks options.</span></span>: '
+        body += '<p><span class="tooltip">Audio<span class="tooltiptext">For video streams only: you can manually specifiy which audio track to include. Some media players can accept them all and let you choose. Not all tracks are available for all games, and injected tracks may not work with skip options below.<br/><br/>If you select "none" for video above, picking an audio track here will make it an audio-only feed that supports the inning start and skip breaks options.</span></span>: '
         for (var i = 0; i < VALID_AUDIO_TRACKS.length; i++) {
           body += '<button '
           if ( audio_track == VALID_AUDIO_TRACKS[i] ) body += 'class="default" '
@@ -2256,16 +2274,16 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">All<span class="tooltiptext">Will include all entitled live MLB broadcasts (games plus Big Inning, Game Changer, and Multiview, as well as MLB Network, SNLA, and/or SNY as appropriate). If favorite team(s) have been provided, it will also include affiliate games for those organizations. Channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
-    let include_teams = 'ath,national'
-    if ( session.credentials.fav_teams.length > 0 ) {
+    let include_teams = 'ath,atl'
+    if ( (session.credentials.fav_teams.length > 0) && (session.credentials.fav_teams[0].length > 0) ) {
       include_teams = session.credentials.fav_teams.toString()
     }
     body += '<p><span class="tooltip">By team<span class="tooltiptext">Including a team (MLB only, by abbreviation, in a comma-separated list if more than 1) will include all of its broadcasts, or if that team is not broadcasting the game, it will include the national broadcast or opponent\'s broadcast if available. It will also include affiliate games for those organizations. Channels/games subject to blackout will be omitted by default. See below for an additional option to override that.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include blackouts<span class="tooltiptext">An optional parameter added to the URL will include channels/games subject to blackout (although you may not be able to play those games).</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">channels.m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeBlackouts=true' + content_protect_b + '">calendar.ics</a></p>' + "\n"
 
-    let exclude_teams = 'ath,national'
-    body += '<p><span class="tooltip">Exclude a team + national<span class="tooltiptext">Excluding a team (MLB only, by abbreviation, in a comma-separated list if more than 1) will exclude every game involving that team. National refers to <a href="https://www.mlb.com/live-stream-games/national-blackout">USA national TV broadcasts</a>.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&excludeTeams=' + exclude_teams + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&excludeTeams=' + exclude_teams + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&excludeTeams=' + exclude_teams + content_protect_b + '">ics</a></p>' + "\n"
+    let exclude_teams = 'ath,atl'
+    body += '<p><span class="tooltip">Exclude a team<span class="tooltiptext">Excluding a team (MLB only, by abbreviation, in a comma-separated list if more than 1) will exclude every game involving that team. Note that blackouts are already excluded without the need to specify this parameter.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&excludeTeams=' + exclude_teams + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&excludeTeams=' + exclude_teams + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&excludeTeams=' + exclude_teams + content_protect_b + '">ics</a></p>' + "\n"
 
     body += '<p><span class="tooltip">Include (or exclude) LIDOM<span class="tooltiptext">Dominican Winter League, aka Liga de Beisbol Dominicano. Live stream only, does not support starting from the beginning or certain innings, skip options, etc.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeTeams=lidom' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=lidom' + content_protect_b + '">ics</a></p>' + "\n"
 
@@ -2299,7 +2317,9 @@ app.get('/', async function(req, res) {
 
     body += '<p><span class="tooltip">Include by level<span class="tooltiptext">Including a level (AAA, AA, A+ encoded as A%2B, or A, in a comma-separated list if more than 1) will include all of its broadcasts, and exclude all other levels.</span></span>: <a href="' + http_root + '/channels.m3u?mediaType=' + mediaType + '&resolution=' + resolution + '&includeLevels=a%2B,aaa' + content_protect_b + '">m3u</a> and <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeLevels=a%2B,aaa' + content_protect_b + '">xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeLevels=a%2B,aaa' + content_protect_b + '">ics</a></p>' + "\n"
 
-    body += '<p><span class="tooltip">Include teams in titles<span class="tooltiptext">An optional parameter added to the URL will include team names in the ICS/XML titles.</span></span>: <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeTeamsInTitles=true' + content_protect_b + '">guide.xml</a> and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeTeamsInTitles=true' + content_protect_b + '">calendar.ics</a></p>' + "\n"
+    body += '<p><span class="tooltip">Include teams in titles<span class="tooltiptext">An optional parameter added to the URL will include team names in the ICS/XML titles. A value of "channels" will format the titles in the style of the <a href="https://community.getchannels.com/t/mlb-tv-for-channels/27492">legacy Channels container</a>.</span></span>: <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeTeamsInTitles=true' + content_protect_b + '">guide.xml</a> or <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeTeamsInTitles=channels' + content_protect_b + '">legacy</a>, and <a href="' + http_root + '/calendar.ics?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&includeTeamsInTitles=true' + content_protect_b + '">calendar.ics</a></p>' + "\n"
+
+    body += '<p><span class="tooltip">Create Off Air events between games<span class="tooltiptext">An optional parameter added to the URL will create "Off Air" events in the XML guide, listing the time of the next game on that channel. A value of "channels" will format the events in the style of the <a href="https://community.getchannels.com/t/mlb-tv-for-channels/27492">legacy Channels container</a>.</span></span>: <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&offAir=true' + content_protect_b + '">guide.xml</a> or <a href="' + http_root + '/guide.xml?mediaType=' + mediaType + '&includeTeams=' + include_teams + '&offAir=channels' + content_protect_b + '">legacy</a></p>' + "\n"
 
     body += '</td></tr></table><br/>' + "\n"
 
@@ -2319,10 +2339,7 @@ app.get('/', async function(req, res) {
       ['Team live radio', '?team=' + example_team + '&mediaType=Audio'],
       ['Catch-up/condensed', '?team=' + example_team + '&resolution=best&skip=pitches&date=today'],
       ['Condensed yesterday', '?team=' + example_team + '&resolution=best&skip=pitches&date=yesterday'],
-      ['Same but DH game 2', '?team=' + example_team + '&resolution=best&skip=pitches&date=yesterday&game=2'],
-      ['Nat\'l game 1 today', '?team=NATIONAL.1&resolution=best&date=today'],
-      ['Same but incl. blackouts', '?team=NATIONAL.1&resolution=best&includeBlackouts=true'],
-      ['Nat\'l game 2 yesterday', '?team=NATIONAL.2&resolution=best&date=yesterday']
+      ['Same but DH game 2', '?team=' + example_team + '&resolution=best&skip=pitches&date=yesterday&game=2']
     ]
 
     if ( argv.free ) {
@@ -2348,12 +2365,13 @@ app.get('/', async function(req, res) {
     }
     body += '</p>' + "\n"
 
+    include_teams = 'ath,atl'
     body += '<p><span class="tooltip">Game Changer by team examples<span class="tooltiptext">Game Changer supports specifying certain teams to include or exclude. Useful for following a group of teams.</span></span>:</p>' + "\n"
     body += '<p>' + "\n"
     let gamechanger_streamURL = server + '/gamechanger.m3u8?resolution=best' + content_protect_b
     let gamechanger_types = ['in', 'ex']
     for (var i=0; i<gamechanger_types.length; i++) {
-      let example_streamURL = gamechanger_streamURL + '&' + gamechanger_types[i] + 'cludeTeams=ath'
+      let example_streamURL = gamechanger_streamURL + '&' + gamechanger_types[i] + 'cludeTeams=' + include_teams
       body += '&bull; ' + gamechanger_types[i] + 'clude: <a href="' + http_root + '/embed.html?src=' + encodeURIComponent(example_streamURL) + '&startFrom=' + VALID_START_FROM[1] + content_protect_b + '">Embed</a> | <a href="' + example_streamURL + '">Stream</a> | <a href="' + http_root + '/chromecast.html?src=' + encodeURIComponent(example_streamURL) + content_protect_b + '">Chromecast</a> | <a href="' + http_root + '/advanced.html?src=' + encodeURIComponent(example_streamURL) + content_protect_b + '">Advanced</a> | <a href="' + http_root + '/kodi.strm?src=' + encodeURIComponent(example_streamURL) + content_protect_b + '">Kodi</a><br/>' + "\n"
     }
 
@@ -2571,7 +2589,7 @@ app.get('/channels.m3u', async function(req, res) {
     includeOrgs = req.query.includeOrgs.toUpperCase().split(',')
   }
 
-  var body = await session.getTVData('channels', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, 'false', resolution, pipe, startingChannelNumber)
+  var body = await session.getTVData('channels', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, 'false', 'false', resolution, pipe, startingChannelNumber)
 
   res.writeHead(200, {'Content-Type': 'audio/x-mpegurl'})
   res.end(body)
@@ -2671,9 +2689,14 @@ app.get('/guide.xml', async function(req, res) {
     includeTeamsInTitles = req.query.includeTeamsInTitles
   }
 
+  let offAir = 'false'
+  if ( req.query.offAir ) {
+    offAir = req.query.offAir
+  }
+
   let server = (req.headers['x-forwarded-proto'] ? req.headers['x-forwarded-proto'] : 'http') + '://' + req.headers.host + http_root
 
-  var body = await session.getTVData('guide', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles)
+  var body = await session.getTVData('guide', mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles, offAir)
 
   res.end(body)
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2025.04.02",
+  "version": "2025.04.05",
   "description": "",
   "repository": {
     "type": "git",

package/session.js

@@ -34,6 +34,8 @@ const AFL_ID = '119'
 const LIDOM_ID = '131'
 const WINTER_LEAGUES = [AFL_ID, LIDOM_ID]
 
+const OFF_AIR_LOGO = 'https://lh3.googleusercontent.com/uVJBX-jpgwHsDY_o6-po2JU5-cDZuoq_CsCcqJ0-T7996z8NbOzeQCfQaAG0DB2hbkxv2VvtZ2E'
+
 // These are the events to ignore, if we're skipping breaks
 const BREAK_TYPES = ['Game Advisory', 'Pitching Substitution', 'Offensive Substitution', 'Defensive Sub', 'Defensive Switch', 'Runner Placed On Base']
 // These are the events to keep, in addition to the last event of each at-bat, if we're skipping pitches
@@ -44,10 +46,10 @@ const EVENT_START_PADDING = -3
 const PITCH_END_PADDING = 2
 const ACTION_END_PADDING = 7
 const MINIMUM_BREAK_DURATION = 5
-// extra padding for MLB events (2025)
-const MLB_PADDING = 39
-// extra Game Changer padding for MLB (2025)
-const MLB_GAMECHANGER_PADDING = 20
+// hardcode extra padding for MLB events
+const MLB_PADDING = 2
+// hardcode extra Game Changer padding for MLB, in 10-second increments as needed
+const MLB_GAMECHANGER_PADDING = 0
 
 const LI_TABLE = {
     1: {
@@ -2158,7 +2160,7 @@ class sessionClass {
   }
 
   // get TV data (channels or guide)
-  async getTVData(dataType, mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles='false', resolution='best', pipe='false', startingChannelNumber=1) {
+  async getTVData(dataType, mediaType, includeTeams, excludeTeams, includeLevels, includeOrgs, server, includeBlackouts, includeTeamsInTitles='false', offAir='false', resolution='best', pipe='false', startingChannelNumber=1) {
     try {
       this.debuglog('getTVData for ' + dataType)
 
@@ -2247,6 +2249,8 @@ class sessionClass {
 
           let blackouts = {}
           if ( includeBlackouts == 'false' ) blackouts = await this.get_blackout_games()
+          
+          let pre_post_shows = await this.get_pre_post_shows()
 
           for (var i = 0; i < cache_data.dates.length; i++) {
             this.debuglog('getTVData processing date ' + cache_data.dates[i].date)
@@ -2301,29 +2305,35 @@ class sessionClass {
                       stream += '&resolution=' + resolution
                       if ( this.protection.content_protect ) stream += '&content_protect=' + this.protection.content_protect
                       if ( pipe == 'true' ) stream = await this.convert_stream_to_pipe(stream, channelid)
-                      channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
+                      if ( !channels[channelid] ) {
+                        channels[channelid] = await this.create_channel_object(channelid, logo, stream, mediaType)
+                      }
 
                       let title = 'Minor League Baseball'
                       if ( WINTER_LEAGUES.includes(league_id.toString()) ) {
                         title = cache_data.dates[i].games[j].teams['home'].team.league.name
                       }
 
-                      let away_team = cache_data.dates[i].games[j].teams['away'].team.name
-                      let home_team = cache_data.dates[i].games[j].teams['home'].team.name
+                      let away_team = cache_data.dates[i].games[j].teams['away'].team.shortName
+                      let home_team = cache_data.dates[i].games[j].teams['home'].team.shortName
                       let subtitle = away_team + ' at ' + home_team
-
-                      if (includeTeamsInTitles == 'true') {
-                        if ( league_id == AFL_ID ) {
-                          title = 'AFL'
-                        } else if ( league_id == LIDOM_ID ) {
-                          title = 'LIDOM'
+                      
+                      if ( includeTeamsInTitles != 'false' ) {
+                        if ( includeTeamsInTitles == 'channels' ) {
+                          title = this.channelsFormattedTitle(subtitle, cache_data.dates[i].games[j].gameDate)
                         } else {
-                          title = 'MiLB'
+                          if ( league_id == AFL_ID ) {
+                            title = 'AFL'
+                          } else if ( league_id == LIDOM_ID ) {
+                            title = 'LIDOM'
+                          } else {
+                            title = 'MiLB'
+                          }
+                          title += ': ' + subtitle
                         }
-                        title += ': ' + subtitle
                       }
 
-                      let description = cache_data.dates[i].games[j].teams['home'].team.league.name + '. '
+                      let description = cache_data.dates[i].games[j].teams['home'].team.sport.name + ' ' + cache_data.dates[i].games[j].teams['home'].team.league.name + '. '
                       if ( cache_data.dates[i].games[j].seriesDescription != 'Regular Season' ) {
                         description += cache_data.dates[i].games[j].seriesDescription + '. '
                       }
@@ -2334,6 +2344,9 @@ class sessionClass {
                       if ( scheduledInnings != '9' ) {
                         description += scheduledInnings + '-inning game. '
                       }
+                      if ( cache_data.dates[i].games[j].teams['away'].team.parentOrgName && cache_data.dates[i].games[j].teams['home'].team.parentOrgName ) {
+                        description += cache_data.dates[i].games[j].teams['away'].team.name + ' (' + this.getParent(cache_data.dates[i].games[j].teams['away'].team.parentOrgName) + ') at ' + cache_data.dates[i].games[j].teams['home'].team.name + ' (' + this.getParent(cache_data.dates[i].games[j].teams['home'].team.parentOrgName) + '). '
+                      }
                       if ( (cache_data.dates[i].games[j].teams['away'].probablePitcher && cache_data.dates[i].games[j].teams['away'].probablePitcher.fullName) || (cache_data.dates[i].games[j].teams['home'].probablePitcher && cache_data.dates[i].games[j].teams['home'].probablePitcher.fullName) ) {
                         if ( cache_data.dates[i].games[j].teams['away'].probablePitcher && cache_data.dates[i].games[j].teams['away'].probablePitcher.fullName ) {
                           description += cache_data.dates[i].games[j].teams['away'].probablePitcher.fullName
@@ -2380,21 +2393,22 @@ class sessionClass {
                       let location = server + '/embed.html?team=' + encodeURIComponent(team) + '&mediaType=' + streamMediaType
                       if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
                       calendar += await this.generate_ics_event(prefix, calendar_start, calendar_stop, subtitle, description, location)
+                      
+                      // Off Air if necessary
+                      let off_air_event = await this.generate_off_air_event(offAir, channelid, cache_data.dates[i].date, channels[channelid].stop, cache_data.dates[i].games[j].gameDate, cache_data.dates[i].games[j].teams['away'].team.shortName + ' at ' + cache_data.dates[i].games[j].teams['home'].team.shortName)
+                      if ( off_air_event ) {
+                        programs += off_air_event
+                        channels[channelid].stop = stop
+                      }
 
                       // MILB guide XML
-                      programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(gameDate), subtitle, team_id, cache_data.dates[i].games[j].gamePk, away_team, home_team)
+                      programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(new Date(cache_data.dates[i].games[j].gameDate)), subtitle, team_id, cache_data.dates[i].games[j].gamePk, away_team, home_team)
 
                       //break
                     //}
                   }
               } else {
                 // Begin MLB games
-                // check blackout status, if necessary
-                let gamePk = cache_data.dates[i].games[j].gamePk.toString()
-                if ( (mediaType == 'MLBTV') && (includeBlackouts == 'false') && blackouts[gamePk] ) {
-                  continue
-                }
-
                 if ( cache_data.dates[i].games[j].broadcasts ) {
                   // initial loop will count number of broadcasts
                   let broadcast_count = await this.count_broadcasts(cache_data.dates[i].games[j].broadcasts, mediaType, language)
@@ -2404,10 +2418,14 @@ class sessionClass {
                       let mediaTitle = 'Audio'
                       if ( broadcast.type == 'TV' ) {
                         mediaTitle = 'MLBTV'
-                      } else if ( broadcast.language == 'es' ) {
-                        mediaTitle = 'Spanish'
                       }
                       if ( mediaType == mediaTitle ) {
+                      
+                        // check blackout or non-entitlement status, if necessary
+                        let gamePk = cache_data.dates[i].games[j].gamePk.toString()
+                        if ( (includeBlackouts == 'false') && blackouts[gamePk] && blackouts[gamePk].blackout_feeds && blackouts[gamePk].blackout_feeds.includes(broadcast.mediaId) ) {
+                          continue
+                        }
 
                         if ( (broadcast.type == 'TV') || ((mediaType == 'Audio') && (broadcast.language == language)) ) {
                           let teamType = broadcast.homeAway
@@ -2486,13 +2504,17 @@ class sessionClass {
                               //logo += '/image.svg?teamId=MLB'
                               //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
                               logo = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRi5AKF6eAu9Va9BzZzgw0PSsQXw8rXPiQLHA'
-                              nationalChannels[channelid] = await this.create_channel_object(channelid, logo, stream, channelMediaType)
+                              if ( !nationalChannels[channelid] ) {
+                                nationalChannels[channelid] = await this.create_channel_object(channelid, logo, stream, channelMediaType)
+                              }
                             } else {
                               seriesId = cache_data.dates[i].games[j].teams[teamType].team.id
                               //logo += '/image.svg?teamId=' + cache_data.dates[i].games[j].teams[teamType].team.id
                               //if ( this.protection.content_protect ) logo += '&amp;content_protect=' + this.protection.content_protect
                               logo = 'https://www.mlbstatic.com/team-logos/share/' + cache_data.dates[i].games[j].teams[teamType].team.id + '.jpg'
-                              channels[channelid] = await this.create_channel_object(channelid, logo, stream, channelMediaType)
+                              if ( !channels[channelid] ) {
+                                channels[channelid] = await this.create_channel_object(channelid, logo, stream, channelMediaType)
+                              }
                             }
 
                             let title = 'MLB Baseball'
@@ -2501,15 +2523,19 @@ class sessionClass {
                             let home_team = cache_data.dates[i].games[j].teams['home'].team.teamName
                             let subtitle = away_team + ' at ' + home_team
 
-                            if (includeTeamsInTitles == 'true') {
-                              title = 'MLB: ' + subtitle + ' (' + station
-                              if ( language == 'es' ) {
-                                title += ' Spanish'
-                              }
-                              if ( mediaType == 'Audio' ) {
-                                title += ' Radio'
+                            if (includeTeamsInTitles != 'false') {
+                              if ( includeTeamsInTitles == 'channels' ) {
+                                title = this.channelsFormattedTitle(subtitle, cache_data.dates[i].games[j].gameDate)
+                              } else {
+                                title = 'MLB: ' + subtitle + ' (' + station
+                                if ( language == 'es' ) {
+                                  title += ' Spanish'
+                                }
+                                if ( mediaType == 'Audio' ) {
+                                  title += ' Radio'
+                                }
+                                title += ')'
                               }
-                              title += ')'
                             }
 
                             let description = station
@@ -2585,7 +2611,42 @@ class sessionClass {
                             calendar += await this.generate_ics_event(prefix, calendar_start, calendar_stop, subtitle, description, location)
 
                             // MLB guide XML
-                            programs += await this.generate_xml_program(channelid, start, stop, title, description, icon, this.convertDateToAirDate(gameDate), subtitle, seriesId, cache_data.dates[i].games[j].gamePk, away_team, home_team)
+                            programs += await this.generate_xml_program(channelid, start, stop, title, description, icon, this.convertDateToAirDate(new Date(cache_data.dates[i].games[j].gameDate)), subtitle, seriesId, cache_data.dates[i].games[j].gamePk, away_team, home_team)
+                            
+                            // pre- and post-game shows
+                            if ( pre_post_shows.pregame_shows[broadcast.mediaId] || pre_post_shows.postgame_shows[broadcast.mediaId] ) {
+                              if ( (pre_post_shows.pregame_shows[broadcast.mediaId] && (pre_post_shows.pregame_shows[broadcast.mediaId].team == 'home')) || (pre_post_shows.postgame_shows[broadcast.mediaId] && (pre_post_shows.postgame_shows[broadcast.mediaId].team == 'home')) ) {
+                               away_team = false
+                              } else {
+                               home_team = false
+                              }
+                              // pre-game
+                              if ( pre_post_shows.pregame_shows[broadcast.mediaId] ) {
+                                let pre_start = this.convertDateToXMLTV(new Date(pre_post_shows.pregame_shows[broadcast.mediaId].start))
+                                title = cache_data.dates[i].games[j].teams[pre_post_shows.pregame_shows[broadcast.mediaId].team].team.teamName + ' Pregame'
+                                let preSeriesId = seriesId + '1'
+                                programs += await this.generate_xml_program(channelid, pre_start, start, title, '', icon, this.convertDateToAirDate(new Date(pre_post_shows.pregame_shows[broadcast.mediaId].start)), '', preSeriesId, cache_data.dates[i].games[j].gamePk, away_team, home_team)
+                                start = pre_start
+                              }
+                              // post-game
+                              if ( pre_post_shows.postgame_shows[broadcast.mediaId] ) {
+                                let postgameMinutes = 30
+                                let startDate = stopDate
+                                stopDate.setMinutes(stopDate.getMinutes()+postgameMinutes)
+                                let post_stop = this.convertDateToXMLTV(stopDate)
+                                title = cache_data.dates[i].games[j].teams[pre_post_shows.postgame_shows[broadcast.mediaId].team].team.teamName + ' Postgame'
+                                let postSeriesId = seriesId + '2'
+                                programs += await this.generate_xml_program(channelid, stop, post_stop, title, '', icon, this.convertDateToAirDate(startDate), '', postSeriesId, cache_data.dates[i].games[j].gamePk, away_team, home_team)
+                                stop = post_stop
+                              }
+                            }
+                            
+                            // Off Air if necessary
+                            let off_air_event = await this.generate_off_air_event(offAir, channelid, cache_data.dates[i].date, channels[channelid].stop, cache_data.dates[i].games[j].gameDate, subtitle)
+                            if ( off_air_event ) {
+                              programs += off_air_event
+                              channels[channelid].stop = stop
+                            }
                           }
                         }
                       }
@@ -2599,7 +2660,6 @@ class sessionClass {
           }
           channels = this.sortObj(channels)
           channels = Object.assign(channels, nationalChannels)
-
           
           let entitlements = await this.getEntitlements()
           // MLB Network live stream for eligible USA subscribers
@@ -2699,7 +2759,7 @@ class sessionClass {
           }
 
           // Big Inning
-          if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
+          if ( (entitlements.length > 0) && (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
             if ( (excludeTeams.length > 0) && excludeTeams.includes('BIGINNING') ) {
               // do nothing
             } else if ( (includeTeams.length == 0) || includeTeams.includes('BIGINNING') ) {
@@ -2733,6 +2793,13 @@ class sessionClass {
                   let location = server + '/embed.html?event=biginning&mediaType=Video&resolution=' + resolution
                   if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
                   calendar += await this.generate_ics_event(prefix, new Date(this.cache.bigInningSchedule[gameDate].start), new Date(this.cache.bigInningSchedule[gameDate].end), title, description, location)
+                  
+                  // Off Air if necessary
+                  let off_air_event = await this.generate_off_air_event(offAir, channelid, gameDate, channels[channelid].stop, this.cache.bigInningSchedule[gameDate].start, title)
+                  if ( off_air_event ) {
+                    programs += off_air_event
+                    channels[channelid].stop = stop
+                  }
 
                   // Big Inning guide XML
                   programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(new Date(this.cache.bigInningSchedule[gameDate].start)))
@@ -2750,7 +2817,7 @@ class sessionClass {
           }
 
           // Game Changer
-          if ( (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
+          if ( (entitlements.length > 0) && (mediaType == 'MLBTV') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
             if ( (excludeTeams.length > 0) && excludeTeams.includes('GAMECHANGER') ) {
               // do nothing
             } else if ( (includeTeams.length == 0) || includeTeams.includes('GAMECHANGER') ) {
@@ -2785,6 +2852,13 @@ class sessionClass {
                     let location = server + '/embed.html?src=' + encodeURIComponent(stream)
                     if ( this.protection.content_protect ) location += '&content_protect=' + this.protection.content_protect
                     calendar += await this.generate_ics_event(prefix, new Date(cache_data.dates[i].games[gameIndexes.firstGameIndex].gameDate), gameDate, title, description, location)
+                    
+                    // Off Air if necessary
+                    let off_air_event = await this.generate_off_air_event(offAir, channelid, cache_data.dates[i].date, channels[channelid].stop, cache_data.dates[i].games[gameIndexes.firstGameIndex].gameDate, title)
+                    if ( off_air_event ) {
+                      programs += off_air_event
+                      channels[channelid].stop = stop
+                    }
 
                     // Game Changer guide XML
                     programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(gameDate))
@@ -2797,7 +2871,7 @@ class sessionClass {
           }
 
           // Multiview
-          if ( (mediaType == 'MLBTV') && (typeof this.data.multiviewStreamURLPath !== 'undefined') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
+          if ( (entitlements.length > 0) && (mediaType == 'MLBTV') && (typeof this.data.multiviewStreamURLPath !== 'undefined') && ((includeLevels.length == 0) || includeLevels.includes('MLB') || includeLevels.includes('ALL')) ) {
             if ( (excludeTeams.length > 0) && excludeTeams.includes('MULTIVIEW') ) {
               // do nothing
             } else if ( (includeTeams.length == 0) || includeTeams.includes('MULTIVIEW') ) {
@@ -2831,6 +2905,13 @@ class sessionClass {
                     let prefix = 'Watch'
                     let location = stream.replace('/stream.m3u8?src=', '/embed.html?msrc=')
                     calendar += await this.generate_ics_event(prefix, new Date(cache_data.dates[i].games[gameIndexes.firstGameIndex].gameDate), gameDate, title, description, location)
+                    
+                    // Off Air if necessary
+                    let off_air_event = await this.generate_off_air_event(offAir, channelid, cache_data.dates[i].date, channels[channelid].stop, cache_data.dates[i].games[gameIndexes.firstGameIndex].gameDate, title)
+                    if ( off_air_event ) {
+                      programs += off_air_event
+                      channels[channelid].stop = stop
+                    }
 
                     // Multview guide XML
                     programs += await this.generate_xml_program(channelid, start, stop, title, description, logo, this.convertDateToAirDate(gameDate))
@@ -2841,7 +2922,7 @@ class sessionClass {
               this.debuglog('getTVData completed Multiview')
             }
           }
-      }
+        }
       } catch(e) {
         this.log('getTVData processing error : ' + e.message)
       }
@@ -3659,40 +3740,57 @@ class sessionClass {
 
     let cache_data
     cache_data = await this.getBlackoutsData(gameDate)
+    
+    let feedTypes = ['videoFeeds', 'audioFeeds']
 
     if ( cache_data && cache_data.results && (cache_data.results.length > 0) ) {
-      for (var j = 0; j < cache_data.results.length; j++) {
-        let game = cache_data.results[j]
+      for (var i = 0; i < cache_data.results.length; i++) {
+        let game = cache_data.results[i]
         let game_pk = game.gamePk
         this.debuglog('get_blackout_games checking game ' + game_pk)
-        if ( game.blackedOutVideo || !game.entitledVideo ) {
-          this.debuglog('get_blackout_games found blackout or non-entitled video')
-          let blackout_type = ''
-          if ( game.videoStatusCodes.includes(2) ) {
-            this.debuglog('get_blackout_games found national blackout')
-            blackout_type = 'National/International'
-          } else if ( game.videoStatusCodes.includes(1) ) {
-            this.debuglog('get_blackout_games found local blackout')
-            blackout_type = 'Local'
-          } else {
-            this.debuglog('get_blackout_games found non-entitled video')
+        let blackout_type = ''
+        if ( game.blackedOutVideo || !game.entitledVideo || !game.entitledAudio ) {
+          if ( !game.entitledVideo || !game.entitledAudio ) {
+            this.debuglog('get_blackout_games found non-entitled game ' + game_pk)
             blackout_type = 'Not entitled'
+          } else {
+            this.debuglog('get_blackout_games found blackout game ' + game_pk)
           }
-          blackouts[game_pk] = { blackout_type: blackout_type }
-        } /*else if ( !game.entitledVideo && (game.videoStatusCodes[0] == '3') ) {
-          this.debuglog('get_blackout_games found non-entitled MVPD required blackout')
-          blackouts[game_pk] = { blackout_type: '' }
-        }*/
-
+          blackouts[game_pk] = { blackout_type: blackout_type }       
+        }
+        
+        let blackout_feeds = []
+        for (var j = 0; j < feedTypes.length; j++) {
+          let feedType = feedTypes[j]
+          for (var k = 0; k < game[feedType].length; k++) {
+            let feed = game[feedType][k]
+            if ( !feed.entitled || ((j == 0) && feed.blackedOut) ) {
+              blackout_feeds.push(feed['mediaId'])
+              if ( !feed['entitled'] ) {
+                this.debuglog('get_blackout_games found non-entitled feed ' + feed.callLetters)
+                blackout_type = 'Not entitled'
+              } else {
+                this.debuglog('get_blackout_games found blackout feed ' + feed.callLetters)
+              }
+            }
+          }
+        }
+        if ( blackout_feeds.length > 0 ) {
+          if ( !blackouts[game_pk] ) {
+            blackouts[game_pk] = { blackout_type: blackout_type }
+          }
+          blackouts[game_pk].blackout_feeds = blackout_feeds   
+        }
+        
         // add blackout expiry, if requested
         if ( blackouts[game_pk] && (blackouts[game_pk].blackout_type != 'Not entitled') && calculate_expiries && await this.check_game_time(game.gameData) ) {
           this.debuglog('get_blackout_games calculating blackout expiry')
           let date_cache_data = await this.getDayData(gameDate)
           if ( date_cache_data.dates && date_cache_data.dates[0] && date_cache_data.dates[0].games && (date_cache_data.dates[0].games.length > 0) ) {
-            for (var k = 0; k < date_cache_data.dates[0].games.length; k++) {
-              if ( game_pk == date_cache_data.dates[0].games[k].gamePk ) {
+            for (var j = 0; j < date_cache_data.dates[0].games.length; j++) {
+              if ( game_pk == date_cache_data.dates[0].games[j].gamePk ) {
                 this.debuglog('get_blackout_games found matching game')
-                let blackoutExpiry = await this.get_blackout_expiry(date_cache_data.dates[0].games[k])
+                let blackoutExpiry = await this.get_blackout_expiry(date_cache_data.dates[0].games[j])
                 this.debuglog('get_blackout_games calculated blackout expiry as ' + blackoutExpiry)
                 blackouts[game_pk].blackoutExpiry = blackoutExpiry
                 break
@@ -3706,6 +3804,45 @@ class sessionClass {
     return blackouts
   }
 
+  // get all pre- and post-game for a date
+  async get_pre_post_shows(gameDate='guide') {
+    this.debuglog('get_pre_post_shows')
+    let pregame_shows = {}
+    let postgame_shows = {}
+
+    let cache_data
+    cache_data = await this.getBlackoutsData(gameDate)
+    
+    let teamTypes = ['home', 'away']
+    let showTypes = ['preGame', 'postGame']
+
+    if ( cache_data && cache_data.results && (cache_data.results.length > 0) ) {
+      for (var i = 0; i < cache_data.results.length; i++) {
+        let game = cache_data.results[i]
+        if ( game.prePostShows ) {
+          for (var j = 0; j < teamTypes.length; j++) {
+            let teamType = teamTypes[j]
+            if ( game.prePostShows[teamType] ) {
+              for (var k = 0; k < showTypes.length; k++) {
+                let showType = showTypes[k]
+                if ( game.prePostShows[teamType][showType] && game.prePostShows[teamType][showType].hasShow ) {
+                  this.debuglog('get_pre_post_shows found ' + teamType + ' ' + showType + ' ' + game.prePostShows[teamType].contentId)
+                  if ( game.prePostShows[teamType][showType].startTime ) {
+                    pregame_shows[game.prePostShows[teamType].contentId] = { team: teamType, start: game.prePostShows[teamType][showType].startTime }
+                  } else {
+                    postgame_shows[game.prePostShows[teamType].contentId] = { team: teamType }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return { pregame_shows, postgame_shows }
+  }
+
   async resetGameChanger(id, includeTeams, excludeTeams) {
     let today = this.liveDate()
     if ( !this.temp_cache.gamechanger || !this.temp_cache.gamechanger.date || (this.temp_cache.gamechanger.date != today) ) {
@@ -3835,7 +3972,12 @@ class sessionClass {
               }
 
               // Game is not broadcast
-              if ( !cache_data.dates[0].games[i].broadcasts || (cache_data.dates[0].games[i].broadcasts.length == 0) || (await this.count_broadcasts(cache_data.dates[0].games[i].broadcasts, 'MLBTV') == 0) ) {
+              if ( !cache_data.dates[0].games[i].broadcasts || (cache_data.dates[0].games[i].broadcasts.length == 0) ) {
+                omitted_games.no_broadcast.push(teams)
+                continue
+              }
+              let broadcast_count = await this.count_broadcasts(cache_data.dates[0].games[i].broadcasts, 'MLBTV')
+              if ( broadcast_count == 0 ) {
                 omitted_games.no_broadcast.push(teams)
                 continue
               }
@@ -3852,8 +3994,8 @@ class sessionClass {
                 continue
               }
 
-              // Game is blacked out
-              if ( this.temp_cache.gamechanger.blackouts[game_pk] ) {
+              // All feeds are blacked out or not entitled
+              if ( this.temp_cache.gamechanger.blackouts[game_pk] && this.temp_cache.gamechanger.blackouts[game_pk].blackout_feeds && (this.temp_cache.gamechanger.blackouts[game_pk].blackout_feeds.length == broadcast_count) ) {
                 omitted_games.blackout.push(teams)
                 continue
               }
@@ -4150,6 +4292,10 @@ class sessionClass {
                         for (var y = 0; y < broadcasts.length; y++) {
                           let broadcast = broadcasts[y]
                           if ( (broadcast.availableForStreaming == true) && (broadcast.type == 'TV') && broadcast.mediaState && broadcast.mediaState.mediaStateCode && (broadcast.mediaState.mediaStateCode == 'MEDIA_ON') ) {
+                            // skip blackout feeds
+                            if ( this.temp_cache.gamechanger.blackouts[curr_game.game_pk] && this.temp_cache.gamechanger.blackouts[curr_game.game_pk].blackout_feeds && this.temp_cache.gamechanger.blackouts[curr_game.game_pk].blackout_feeds.includes(broadcast.mediaId) ) {
+                              continue
+                            }
                             // prefer fav team broadcasts
                             if ( this.credentials.fav_teams.length > 0 ) {
                               for (var z = 0; z < this.credentials.fav_teams.length; z++) {
@@ -4351,21 +4497,23 @@ class sessionClass {
     if ( subtitle ) {
       xml_output += '      <sub-title lang="en">' + subtitle + '</sub-title>' + "\n"
     }
-    xml_output += '      <desc lang="en">' + description.trim() + '</desc>' + "\n" +
-    '      <category lang="en">Sports</category>' + "\n" +
-    '      <category lang="en">Baseball</category>' + "\n" +
-    '      <category lang="en">Sports event</category>' + "\n" +
-    '      <icon src="' + icon + '"></icon>' + "\n"
+    xml_output += '      <icon src="' + icon + '"></icon>' + "\n"
+    if ( icon != OFF_AIR_LOGO ) {
+      xml_output += '      <desc lang="en">' + description.trim() + '</desc>' + "\n" +
+      '      <category lang="en">Sports</category>' + "\n" +
+      '      <category lang="en">Baseball</category>' + "\n" +
+      '      <category lang="en">Sports event</category>' + "\n" + 
+      '      <episode-num system="original-air-date">' + date + '</episode-num>' + "\n" + 
+      '      <new/>' + "\n" +
+      '      <live/>' + "\n" +
+      '      <sport>Baseball</sport>' + "\n"
+    }
     if ( teamId ) {
       xml_output += '      <series-id system="team-id">' + teamId + '</series-id>' + "\n"
     }
-    xml_output += '      <episode-num system="original-air-date">' + date + '</episode-num>' + "\n"
     if ( gamePk ) {
       xml_output += '      <episode-num system="game-id">' + gamePk + '</episode-num>' + "\n"
     }
-    xml_output += '      <new/>' + "\n" +
-    '      <live/>' + "\n" +
-    '      <sport>Baseball</sport>' + "\n"
     if ( away_team ) {
       xml_output += '      <team lang="en">' + away_team + '</team>' + "\n"
     }
@@ -4388,7 +4536,47 @@ class sessionClass {
     channel_object.mediatype = channelMediaType
     return channel_object
   }
-
+  
+  async generate_off_air_event(offAir, channelid, gameDate, start, stop, title) {
+    try {
+      if ( offAir != 'false' ) {
+        let today = this.liveDate()
+        let nextWeek = new Date(today)
+        nextWeek.setDate(nextWeek.getDate()+6)
+        nextWeek = nextWeek.toISOString().substring(0,10)
+        if ( !start ) {
+          start = this.convertDateToXMLTV(new Date(today + ' 00:00:00'))
+        }
+        let offAirTitle = 'Off Air'
+        let offAirSubtitle = ''
+        let day = new Date(gameDate + ' 00:00:00').toLocaleString('en-US', { weekday: 'long' })
+        if ( gameDate == today ) {
+          day = 'Today'
+        }
+        if ( gameDate > nextWeek ) {
+          day += ' ' + this.channelsFormattedDate(stop)
+        }
+        let time = new Date(stop).toLocaleString('en-US', { hour: 'numeric', minute: 'numeric', hour12: true })
+        if ( offAir == 'channels' ) {
+          offAirTitle = 'Upcoming: ' + time + ' ' + day + ', ' + title
+          offAirSubtitle = ''
+        } else {
+          offAirSubtitle = 'next ' + day + ' ' + time
+        }
+        return await this.generate_xml_program(channelid, start, this.convertDateToXMLTV(new Date(stop)), offAirTitle, '', OFF_AIR_LOGO, '', offAirSubtitle)
+      }
+    } catch(e) {
+      this.log('generate_off_air_event error : ' + e.message)
+    }
+  }
+  
+  channelsFormattedTitle(subtitle, date) {
+    return subtitle + ' *Live* ' + this.channelsFormattedDate(date)
+  }
+  
+  channelsFormattedDate(date) {
+    return new Date(date).toLocaleString('en-us', { month: 'short', day: 'numeric' })
+  }
 }
 
 module.exports = sessionClass