9.9.638_v1

Author: Mariusz89B

addon.xml

@@ -2,7 +2,7 @@
 <addon
     id="script.mtvguide"
     name="m-TVGuide [COLOR gold][B]EPG[/B][/COLOR]"
-    version="9.9.637"
+    version="9.9.638-beta.1"
     provider-name="mariusz89b">
   <requires>
     <import addon="xbmc.addon" version="17.0.0"/>
@@ -41,7 +41,10 @@
     <forum>https://github.com/Mariusz89B/script.mtvguide/discussions</forum>
 	<website>https://github.com/Mariusz89B/script.mtvguide</website>
     <source>m-TVGuide © 2013 - 2023</source>
-    <news>v9.9.637 (2023-01-05)
+    <news>v9.9.638 (2023-03-12)
+- Fixed catchup default setting for playing/downloading content longer than 1 hour.
+
+v9.9.637 (2023-01-05)
 - EPG redraw fixes.
 - Decreased interval for auto EPG update.
 - Other fixes.

changelog.txt

@@ -1,4 +1,7 @@
-v9.9.637 (2023-01-05)
+v9.9.638 (2023-03-12)
+- Fixed catchup default setting for playing/downloading content longer than 1 hour.
+
+v9.9.637 (2023-01-05)
 - EPG redraw fixes.
 - Decreased interval for auto EPG update.
 - Other fixes.

playService.py

@@ -1319,7 +1319,7 @@ def LoadVideoLink(self, channel, service, url):
 
                                         # Default
                                         if ADDON.getSetting('archive_type') == '0':
-                                            matches = re.compile(r'^(http[s]?://[^/]+)/([^/]+)/([^/]*)(mpegts|\\.m3u8)(\\?.+=.+)?$')
+                                            matches = re.compile(r'^(http[s]?://[^/]+)/([^/]+)/([^/]*)(mpegts|\.m3u8)(\\?.+=.+)?$')
 
                                             catchupList = ['hls-custom', 'mono']
 
@@ -1432,7 +1432,7 @@ def LoadVideoLink(self, channel, service, url):
 
                                         # Xtream Codes
                                         if ADDON.getSetting('archive_type') == '2':
-                                            matches = re.compile(r'^(http[s]?://[^/]+)/(?:live/)?([^/]+)/([^/]+)/([^/\\.]+)(\\.m3u[8]?|\\.ts)?$')
+                                            matches = re.compile(r'^(http[s]?://[^/]+)/(?:live/)?([^/]+)/([^/]+)/([^/\\.]+)(\.m3u[8]?|\.ts)?$')
 
                                             if matches.match(strmUrl):
                                                 xcHost = matches.search(strmUrl).group(1)

recordService.py

@@ -745,7 +745,7 @@ def downloadUrl(self, url, threadData):
                 archivePlaylist = str(self.archiveString)
                 catchupList = archivePlaylist.split(', ')
 
-                p = re.compile('service=playlist_\d&cid=\d+_AR.*')
+                p = re.compile(r'service=playlist_\d&cid=\d+_AR.*')
 
                 if not p.match(url):
                     return False
@@ -770,7 +770,7 @@ def downloadUrl(self, url, threadData):
                             strmUrl = strmUrl_catchup.format(utc=utc, lutc=lutc)
 
                         if 'mono' in strmUrl:
-                            strmUrl = re.sub('\$', '', str(strmUrl))
+                            strmUrl = re.sub(r'\$', '', str(strmUrl))
                             strmUrl = re.sub('mono', 'video', str(strmUrl))
                     else:
                         deb('archive_type(4) wrong type')
@@ -784,7 +784,7 @@ def downloadUrl(self, url, threadData):
 
                     # Default
                     if ADDON.getSetting('archive_type') == '0':
-                        matches = re.compile('^(http[s]?://[^/]+)/([^/]+)/([^/]*)(mpegts|\\.m3u8)(\\?.+=.+)?$')
+                        matches = re.compile(r'^(http[s]?://[^/]+)/([^/]+)/([^/]*)(mpegts|\.m3u8)(\\?.+=.+)?$')
 
                         catchupList = ['hls-custom', 'mono']
 
@@ -874,10 +874,10 @@ def downloadUrl(self, url, threadData):
                     if ADDON.getSetting('archive_type') == '1':
                         setting = ADDON.getSetting('archive_string')
 
-                        putc = re.compile('(^\?utc=|^\&utc=)')
+                        putc = re.compile(r'(^\?utc=|^\&utc=)')
                         mutc = putc.match(setting)
 
-                        putv = re.compile('(^.*)(\{Y\}.\{m\}.\{d\}.*\{H\}.\{M\}.\{S\})(?=.*|$)')
+                        putv = re.compile(r'(^.*)(\{Y\}.\{m\}.\{d\}.*\{H\}.\{M\}.\{S\})(?=.*|$)')
                         mutv = putv.match(setting)
 
                         if mutc:
@@ -886,15 +886,15 @@ def downloadUrl(self, url, threadData):
                         elif mutv:
                             catchup = ADDON.getSetting('archive_string').format(Y=year, m=month, d=day, H=hour, M=minute, S=second)
 
-                        putc = re.compile('(^\?utc=|^\&utc=)')
+                        putc = re.compile(r'(^\?utc=|^\&utc=)')
                         mutc = putc.match(catchup)
 
-                        putv = re.compile('(^.*)(\d{4}.\d{2}.\d{2}.*\d{2}.\d{2}.\d{2})(?=.*|$)')
+                        putv = re.compile(r'(^.*)(\d{4}.\d{2}.\d{2}.*\d{2}.\d{2}.\d{2})(?=.*|$)')
                         mutv = putv.match(catchup)
 
                         m_catchupSource = strmUrl + catchup
 
-                        if mutc: 
+                        if mutc:
                             strmUrl = m_catchupSource + '-' + str(int(duration)*60)
 
                         elif mutv:
@@ -911,7 +911,7 @@ def downloadUrl(self, url, threadData):
 
                     # Xtream Codes
                     if ADDON.getSetting('archive_type') == '2':
-                        matches = re.compile('^(http[s]?://[^/]+)/(?:live/)?([^/]+)/([^/]+)/([^/\\.]+)(\\.m3u[8]?|\\.ts)?$')
+                        matches = re.compile(r'^(http[s]?://[^/]+)/(?:live/)?([^/]+)/([^/]+)/([^/\\.]+)(\.m3u[8]?|\.ts)?$')
 
                         if matches.match(strmUrl):
                             xcHost = matches.search(strmUrl).group(1)
@@ -1003,7 +1003,7 @@ def download(self, recordCommand, threadData):
             self.downloading = True
 
             for line in threadData['downloadHandle'].stdout:
-                p = re.compile('.*time=(.*?)\s')
+                p = re.compile(r'.*time=(.*?)\s')
 
                 i = 1
 
@@ -1117,8 +1117,6 @@ def generateFFMPEGDownloadCommand(self, channelInfo, programDuration, destinatio
         recordCommand = list()
         recordCommand.append(self.ffmpegdumpExe)
 
-        duration = datetime.timedelta(seconds=int(programDuration))
-
         streamSource = channelInfo.strm
 
         cookieSeparator = streamSource.find('|')
@@ -1129,7 +1127,7 @@ def generateFFMPEGDownloadCommand(self, channelInfo, programDuration, destinatio
 
             headers = removedCookie.split('&')
             newHeader = ""
-            newCookie = ""  
+            newCookie = ""
 
             UA = serviceLib.HOST
 
@@ -1197,7 +1195,7 @@ def generateFFMPEGDownloadCommand(self, channelInfo, programDuration, destinatio
             recordCommand.append("h264_mp4toannexb")
 
         recordCommand.append("-t")
-        recordCommand.append(str(duration))
+        recordCommand.append("{}".format(programDuration))
         recordCommand.append("-loglevel")
         recordCommand.append("info")
         recordCommand.append("-n")