V 0.7.6

* Add nocheck attribute for EpgImporter sources (fix for new EpgImporter version)
* Add m3u8 VOD stream matching

README.md

@@ -306,8 +306,8 @@ which makes editing the crontab easier)
 ### v0.7.5
 * Additional stream url type checking (e.g. live or VOD)
 
-### v0.8
-* When providers boquet is downloaded (-b or -bd option) use full service references
-  instead of just the epg releveant part incase it's used for picon naming
+### v0.7.6
+* Add nocheck attribute for EpgImporter sources (fix for new EpgImporter version)
+* Add m3u8 VOD stream matching
 
 Visit https://www.suls.co.uk/enigma2-iptv-bouquets-with-epg/ for further information on the script

e2m3u2bouquet.py

@@ -40,9 +40,9 @@
 from argparse import RawDescriptionHelpFormatter
 
 __all__ = []
-__version__ = '0.7.5'
+__version__ = '0.7.6'
 __date__ = '2017-06-04'
-__updated__ = '2018-06-08'
+__updated__ = '2018-09-14'
 
 DEBUG = 0
 TESTRUN = 0
@@ -342,7 +342,11 @@ def set_streamtypes_vodcats(self, channeldict, all_iptv_stream_types, tv_stream_
         """
         parsed_stream_url = urlparse.urlparse(channeldict['stream-url'])
 
+        # check for vod streams ending .*.m3u8 e.g. 2345.mp4.m3u8
+        is_m3u8_vod = re.search('\..+\.m3u8$', parsed_stream_url.path)
+
         if (parsed_stream_url.path.endswith('.ts') or parsed_stream_url.path.endswith('.m3u8')) \
+                and not is_m3u8_vod \
                 and not channeldict['group-title'].startswith('VOD'):
             channeldict['stream-type'] = '4097' if all_iptv_stream_types else '1'
             if tv_stream_type:
@@ -988,7 +992,7 @@ def create_epgimport_source(self, sources, provider, group=None):
         with open(os.path.join(EPGIMPORTPATH, source_filename), "w+") as f:
             f.write('<sources>\n')
             f.write('{}<sourcecat sourcecatname="IPTV Bouquet Maker - E2m3u2bouquet">\n'.format(indent))
-            f.write('{}<source type="gen_xmltv" channels="{}">\n'
+            f.write('{}<source type="gen_xmltv" nocheck="1" channels="{}">\n'
                     .format(2 * indent, channels_filename))
             f.write('{}<description>{}</description>\n'.format(3 * indent, self.xml_escape(source_name)))
             for source in sources:
@@ -1107,11 +1111,11 @@ def makeconfig(self, configfile):
         f = open(configfile, 'wb')
         f.write("""<!--\r
     E2m3u2bouquet supplier config file\r
-    Add as many suppliers as required and run the script with no parameters\r 
-    this config file will be used and the relevant bouquets set up for all suppliers entered\r 
+    Add as many suppliers as required and run the script with no parameters\r
+    this config file will be used and the relevant bouquets set up for all suppliers entered\r
     0 = No/false\r
     1 = Yes/true\r
-    For elements with <![CDATA[]] enter value between brackets e.g. <![CDATA[mypassword]]>\r 
+    For elements with <![CDATA[]] enter value between brackets e.g. <![CDATA[mypassword]]>\r
 -->\r
 <config>\r
     <supplier>\r