threefive 2.4.45__tar.gz → 2.4.49__tar.gz

{threefive-2.4.45/threefive.egg-info → threefive-2.4.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threefive
-Version: 2.4.45
+Version: 2.4.49
 Summary: The Undisputed Heavyweight Champion of SCTE-35.
 Home-page: https://github.com/futzu/threefive
 Author: Adrian and a Cast of Thousands.
@@ -25,20 +25,35 @@ License-File: LICENSE
 
 
 ___
-# Latest __threefive__ version is `2`.`4`.`45` 
-* this is the 279th release of threefive
+# Latest __threefive__ version is `2`.`4`.`49` 
+* this is the 281th release of threefive
 * Cyclomatic Complexity Score 1.99
 * EIDR UPIDs are now in compact binary format
 * Stream class now includes PCR timestamps
 * Stream class now logs PAT, PMT, and SDT changes
 * SCTE-35 PES Packets are now properly handled 
-  
+* Unknown UPID types handled properly
+* fixed Cue.load() and encode_to_hex()
 ---
 
 
 
 # `Documentation`
 
+
+* SCTE-35 on the [command line](https://github.com/futzu/scte35parser-threefive/blob/master/cli.md)
+
+* [Trigger on SCTE-35 events](https://github.com/futzu/scte35parser-threefive/blob/master/trigger.md) using threefive.Stream
+
+* SCTE-35 code [examples](https://github.com/futzu/SCTE35-threefive/blob/master/examples/README.md)
+
+* [Encoding](https://github.com/futzu/scte35parser-threefive/blob/master/Encoding.md) and [Encoding | more ](https://github.com/futzu/scte35parser-threefive/blob/master/EncodingPipeMore.md)
+
+* [Parse SCTE-35 programmatically ](https://github.com/futzu/scte35parser-threefive/blob/master/prog.md) with a few lines of code
+
+
+
+
 <details><summary>Install</summary>
 	<br/>
 * install threefive with pip
@@ -79,23 +94,6 @@ a@slow:~/threefive$
 </details>
 
 
-
-
-#### SCTE-35 on the [command line](https://github.com/futzu/scte35parser-threefive/blob/master/cli.md)
-
-#### [Trigger on SCTE-35 events](https://github.com/futzu/scte35parser-threefive/blob/master/trigger.md) using threefive.Stream
-
-#### SCTE-35 code [examples](https://github.com/futzu/SCTE35-threefive/blob/master/examples/README.md)
-
-#### [Encoding](https://github.com/futzu/scte35parser-threefive/blob/master/Encoding.md) and [Encoding | more ](https://github.com/futzu/scte35parser-threefive/blob/master/EncodingPipeMore.md)
-
-#### [Parse SCTE-35 programmatically ](https://github.com/futzu/scte35parser-threefive/blob/master/prog.md) with a few lines of code
-
-
-
-
-
-
  <details><summary>Cue Class</summary>
 
    *  src [cue.py](https://github.com/futzu/SCTE35-threefive/blob/master/threefive/cue.py)

{threefive-2.4.45 → threefive-2.4.49}/README.md

@@ -9,20 +9,35 @@
 
 
 ___
-# Latest __threefive__ version is `2`.`4`.`45` 
-* this is the 279th release of threefive
+# Latest __threefive__ version is `2`.`4`.`49` 
+* this is the 281th release of threefive
 * Cyclomatic Complexity Score 1.99
 * EIDR UPIDs are now in compact binary format
 * Stream class now includes PCR timestamps
 * Stream class now logs PAT, PMT, and SDT changes
 * SCTE-35 PES Packets are now properly handled 
-  
+* Unknown UPID types handled properly
+* fixed Cue.load() and encode_to_hex()
 ---
 
 
 
 # `Documentation`
 
+
+* SCTE-35 on the [command line](https://github.com/futzu/scte35parser-threefive/blob/master/cli.md)
+
+* [Trigger on SCTE-35 events](https://github.com/futzu/scte35parser-threefive/blob/master/trigger.md) using threefive.Stream
+
+* SCTE-35 code [examples](https://github.com/futzu/SCTE35-threefive/blob/master/examples/README.md)
+
+* [Encoding](https://github.com/futzu/scte35parser-threefive/blob/master/Encoding.md) and [Encoding | more ](https://github.com/futzu/scte35parser-threefive/blob/master/EncodingPipeMore.md)
+
+* [Parse SCTE-35 programmatically ](https://github.com/futzu/scte35parser-threefive/blob/master/prog.md) with a few lines of code
+
+
+
+
 <details><summary>Install</summary>
 	<br/>
 * install threefive with pip
@@ -63,23 +78,6 @@ a@slow:~/threefive$
 </details>
 
 
-
-
-#### SCTE-35 on the [command line](https://github.com/futzu/scte35parser-threefive/blob/master/cli.md)
-
-#### [Trigger on SCTE-35 events](https://github.com/futzu/scte35parser-threefive/blob/master/trigger.md) using threefive.Stream
-
-#### SCTE-35 code [examples](https://github.com/futzu/SCTE35-threefive/blob/master/examples/README.md)
-
-#### [Encoding](https://github.com/futzu/scte35parser-threefive/blob/master/Encoding.md) and [Encoding | more ](https://github.com/futzu/scte35parser-threefive/blob/master/EncodingPipeMore.md)
-
-#### [Parse SCTE-35 programmatically ](https://github.com/futzu/scte35parser-threefive/blob/master/prog.md) with a few lines of code
-
-
-
-
-
-
  <details><summary>Cue Class</summary>
 
    *  src [cue.py](https://github.com/futzu/SCTE35-threefive/blob/master/threefive/cue.py)

{threefive-2.4.45 → threefive-2.4.49}/threefive/cue.py

@@ -126,7 +126,7 @@ class Cue(SCTE35Base):
             data = data + "="
         return data
 
-    def _mk_bits(self, data):
+    def _mk_bits(self,data):
         """
         cue._mk_bits Converts
         Hex and Base64 strings into bytes.
@@ -160,13 +160,11 @@ class Cue(SCTE35Base):
         Cue.info_section.descriptor_loop_length,
         then call Cue._descriptor_loop
         """
-        if bites:
-            dll = (bites[0] << 8) | bites[1]
-            self.info_section.descriptor_loop_length = dll
-            bites = bites[2:]
-            self._descriptor_loop(bites[:dll])
-            bites = bites[dll:]
-        return bites
+        dll = (bites[0] << 8) | bites[1]
+        self.info_section.descriptor_loop_length = dll
+        bites = bites[2:]
+        self._descriptor_loop(bites[:dll])
+        return bites[dll:]
 
     def mk_info_section(self, bites):
         """
@@ -218,9 +216,6 @@ class Cue(SCTE35Base):
         dscptr_bites = self._unloop_descriptors()
         dll = len(dscptr_bites)
         self.info_section.descriptor_loop_length = dll
-        if not self.command:
-            err_mesg = "\033[7mA splice command is required\033[27m"
-            raise ValueError(err_mesg)
         cmd_bites = self.command.encode()
         cmdl = self.command.command_length = len(cmd_bites)
         self.info_section.splice_command_length = cmdl
@@ -286,18 +281,14 @@ class Cue(SCTE35Base):
             'descriptors': [list of {dicts}],
             }
         """
-        try:
-            if isinstance(stuff, str):
-                stuff = json.loads(stuff)
-            if "info_section" in stuff:
-                self.load_info_section(stuff["info_section"])
-            if "command" in stuff:
-                self.load_command(stuff["command"])
-            if "descriptors" in stuff:
-                self.load_descriptors(stuff["descriptors"])
-            return True
-        except:
-            return False
+        if isinstance(stuff, str):
+            stuff = json.loads(stuff)
+        if "info_section" in stuff:
+            self.load_info_section(stuff["info_section"])
+        if "command" in stuff:
+            self.load_command(stuff["command"])
+        if "descriptors" in stuff:
+            self.load_descriptors(stuff["descriptors"])
 
     def load_info_section(self, isec):
         """

{threefive-2.4.45 → threefive-2.4.49}/threefive/descriptors.py

@@ -359,8 +359,11 @@ class SegmentationDescriptor(SpliceDescriptor):
             self.segmentation_duration = self.as_90k(self.segmentation_duration_ticks)
         self.segmentation_upid_type = bitbin.as_int(8)
         self.segmentation_upid_length = bitbin.as_int(8)
-        the_upid = upid_map[self.segmentation_upid_type][1](
-            bitbin, self.segmentation_upid_type, self.segmentation_upid_length
+        upid_type = self.segmentation_upid_type
+        if upid_type not in upid_map:
+            upid_type = 0xFD
+        the_upid = upid_map[upid_type][1](
+            bitbin, upid_type, self.segmentation_upid_length
         )
         self.segmentation_upid_type_name, self.segmentation_upid = the_upid.decode()
         self.segmentation_type_id = bitbin.as_int(8)
@@ -434,6 +437,8 @@ class SegmentationDescriptor(SpliceDescriptor):
         self._chk_var(int, nbin.add_int, "segmentation_upid_type", 8)
         self._chk_var(int, nbin.add_int, "segmentation_upid_length", 8)
         upid_type = self.segmentation_upid_type
+        if upid_type not in upid_map:
+            upid_type = 0xFD
         the_upid = upid_map[upid_type][1](
             None, upid_type, self.segmentation_upid_length
         )

{threefive-2.4.45 → threefive-2.4.49}/threefive/version.py

@@ -2,4 +2,4 @@
 threefive.version
 from the cli tool run: threefive version
 """
-version='2.4.45'
+version='2.4.49'

{threefive-2.4.45 → threefive-2.4.49/threefive.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threefive
-Version: 2.4.45
+Version: 2.4.49
 Summary: The Undisputed Heavyweight Champion of SCTE-35.
 Home-page: https://github.com/futzu/threefive
 Author: Adrian and a Cast of Thousands.
@@ -25,20 +25,35 @@ License-File: LICENSE
 
 
 ___
-# Latest __threefive__ version is `2`.`4`.`45` 
-* this is the 279th release of threefive
+# Latest __threefive__ version is `2`.`4`.`49` 
+* this is the 281th release of threefive
 * Cyclomatic Complexity Score 1.99
 * EIDR UPIDs are now in compact binary format
 * Stream class now includes PCR timestamps
 * Stream class now logs PAT, PMT, and SDT changes
 * SCTE-35 PES Packets are now properly handled 
-  
+* Unknown UPID types handled properly
+* fixed Cue.load() and encode_to_hex()
 ---
 
 
 
 # `Documentation`
 
+
+* SCTE-35 on the [command line](https://github.com/futzu/scte35parser-threefive/blob/master/cli.md)
+
+* [Trigger on SCTE-35 events](https://github.com/futzu/scte35parser-threefive/blob/master/trigger.md) using threefive.Stream
+
+* SCTE-35 code [examples](https://github.com/futzu/SCTE35-threefive/blob/master/examples/README.md)
+
+* [Encoding](https://github.com/futzu/scte35parser-threefive/blob/master/Encoding.md) and [Encoding | more ](https://github.com/futzu/scte35parser-threefive/blob/master/EncodingPipeMore.md)
+
+* [Parse SCTE-35 programmatically ](https://github.com/futzu/scte35parser-threefive/blob/master/prog.md) with a few lines of code
+
+
+
+
 <details><summary>Install</summary>
 	<br/>
 * install threefive with pip
@@ -79,23 +94,6 @@ a@slow:~/threefive$
 </details>
 
 
-
-
-#### SCTE-35 on the [command line](https://github.com/futzu/scte35parser-threefive/blob/master/cli.md)
-
-#### [Trigger on SCTE-35 events](https://github.com/futzu/scte35parser-threefive/blob/master/trigger.md) using threefive.Stream
-
-#### SCTE-35 code [examples](https://github.com/futzu/SCTE35-threefive/blob/master/examples/README.md)
-
-#### [Encoding](https://github.com/futzu/scte35parser-threefive/blob/master/Encoding.md) and [Encoding | more ](https://github.com/futzu/scte35parser-threefive/blob/master/EncodingPipeMore.md)
-
-#### [Parse SCTE-35 programmatically ](https://github.com/futzu/scte35parser-threefive/blob/master/prog.md) with a few lines of code
-
-
-
-
-
-
  <details><summary>Cue Class</summary>
 
    *  src [cue.py](https://github.com/futzu/SCTE35-threefive/blob/master/threefive/cue.py)