threefive 2.4.97__tar.gz → 2.4.99__tar.gz

{threefive-2.4.97 → threefive-2.4.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threefive
-Version: 2.4.97
+Version: 2.4.99
 Summary: The Undisputed Heavyweight Champion of SCTE-35. The Belts have been Unified.
 Home-page: https://github.com/futzu/threefive
 Author: Adrian of Doom, and the Fine Folks at Fu Corp.
@@ -11,7 +11,6 @@ Description:  | [cli](#cli) | [lib](#lib) | [examples](#examples) | [hls](https:
         # threefive is SCTE-35.
         ##### SCTE-35 Parser. SCTE-35 Decoder. SCTE-35 Encoder. MPEGTS SCTE-35 Packet Injection. HLS Manifest and Segment SCTE-35 Parser. HLS SCTE-35 Injection. SCTE-35 Xml and Xml+bin Decoder/ Encoder for DASH.
         
-        
         ## Latest version is v2.4.97
         * Updated to latest version of new_reader for Zero packet loss Multicast _(tested on OpenBSD and Debian)_.   
         * [The cli has been Upgraded and tuned.]((https://github.com/futzu/threefive/blob/master/latest-cli.md))
@@ -23,7 +22,7 @@ Description:  | [cli](#cli) | [lib](#lib) | [examples](#examples) | [hls](https:
         * MPEGTS Packet Injection added to the __threefive cli.__.
             * [Sidecar files explained](https://github.com/futzu/SCTE35_threefive/blob/master/sidecar.md)
         * [sixfix](https://github.com/futzu/SCTE35_threefive/blob/master/newcli.md) : __ffmpeg__ turns SCTE-35 streams to __bin data (0x06)__, sixfix switches them back to SCTE-35 (0x86).
-        * [Xml](https://github.com/futzu/SCTE35-threefive/blob/master/newcli.md): Experimental support for [SCTE-35 xml as an input and output](https://github.com/futzu/SCTE35_threefive/blob/master/xml.md) ( DASH SCTE-214)
+        * [Xml](https://github.com/futzu/SCTE35-threefive/blob/master/latest-cli.md): Experimental support for [SCTE-35 xml as an input and output](https://github.com/futzu/SCTE35_threefive/blob/master/xml.md) ( DASH SCTE-214)
         
         
         # Documentation

{threefive-2.4.97 → threefive-2.4.99}/README.md

@@ -3,7 +3,6 @@
 # threefive is SCTE-35.
 ##### SCTE-35 Parser. SCTE-35 Decoder. SCTE-35 Encoder. MPEGTS SCTE-35 Packet Injection. HLS Manifest and Segment SCTE-35 Parser. HLS SCTE-35 Injection. SCTE-35 Xml and Xml+bin Decoder/ Encoder for DASH.
 
-
 ## Latest version is v2.4.97
 * Updated to latest version of new_reader for Zero packet loss Multicast _(tested on OpenBSD and Debian)_.   
 * [The cli has been Upgraded and tuned.]((https://github.com/futzu/threefive/blob/master/latest-cli.md))
@@ -15,7 +14,7 @@
 * MPEGTS Packet Injection added to the __threefive cli.__.
     * [Sidecar files explained](https://github.com/futzu/SCTE35_threefive/blob/master/sidecar.md)
 * [sixfix](https://github.com/futzu/SCTE35_threefive/blob/master/newcli.md) : __ffmpeg__ turns SCTE-35 streams to __bin data (0x06)__, sixfix switches them back to SCTE-35 (0x86).
-* [Xml](https://github.com/futzu/SCTE35-threefive/blob/master/newcli.md): Experimental support for [SCTE-35 xml as an input and output](https://github.com/futzu/SCTE35_threefive/blob/master/xml.md) ( DASH SCTE-214)
+* [Xml](https://github.com/futzu/SCTE35-threefive/blob/master/latest-cli.md): Experimental support for [SCTE-35 xml as an input and output](https://github.com/futzu/SCTE35_threefive/blob/master/xml.md) ( DASH SCTE-214)
 
 
 # Documentation

{threefive-2.4.97 → threefive-2.4.99}/bin/threefive

@@ -6,12 +6,13 @@ threefive command line SCTE35 decoder.
 """
 
 
+import select
 import sys
 from new_reader import reader
 from threefive import Cue, Stream, print2, decode, version
+from threefive.hls import cli as hlscli
 from threefive.sixfix import sixfix
 from threefive.superkabuki import SuperKabuki
-from threefive.showcues import cli as hlscli
 from sideways import cli as sidecli
 
 REV = "\033[7;1m"
@@ -31,6 +32,7 @@ class SupaStream(Stream):
 
     def _parse_scte35(self, pkt, pid):
         print2(pkt)
+        print2("")
         super()._parse_scte35(pkt, pid)
 
 
@@ -48,50 +50,60 @@ def mk_sidecar(cue):
 
 
 HELP = f"""
-{B}threefive                    {U}
+threefive                    {U}
 
-\tSCTE-35 inputs:{BLUE}mpegts, base64, hex, json, xml, and xmlbin{U} are auto-detected.
-\tSCTE-35 outputs are {BLUE}base64, bytes, hex, int, json, xml, and xmlbin.{U}
+{B} Default    {U} {BLUE}The default action is to read a input and write a SCTE-35 output.{U}
 
-         Input:{U}    Output:{U}
-\t{U}{BLUE} mpegts {U}  {U}{BLUE} base64 {NORM} threefive https://example.com/video.ts {BLUE} base64 {U}
-\t{U}{BLUE} xml    {U}  {U}{BLUE} bytes  {NORM} threefive {BLUE} bytes {U} < xml.xml
-\t{U}{BLUE} base64 {U}  {U}{BLUE} hex    {NORM} threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q==' {BLUE} hex {U}
-\t{U}{BLUE} xmlbin {U}  {U}{BLUE} int    {NORM} threefive {BLUE} int {U} < xml.xml
-\t{U}{BLUE} mpegts {U}  {U}{BLUE} json   {NORM} threefive video.ts
-\t{U}{BLUE} json   {U}  {U}{BLUE} xml    {NORM} threefive  < json.json {BLUE} xml {U}
-\t{U}{BLUE} hex    {U}  {U}{BLUE} xmlbin {NORM} threefive 0xfc301600000000000000fff00506fe00a98ac700000b3baed9 {BLUE} xmlbin {U}
+  {BLUE}inputs {U} mpegts, base64, hex, json, xml, and xmlbin{U}.
 
-{B}    hls      {U}{NORM} {BLUE}HLS decode SCTE-35:{NORM} threefive hls https://example.com/master.m3u8
-\t\t\t\t  threefive hls help
-              {BLUE}HLS encode SCTE-35:{U} threefive hls encode  -i https://example.com/master.m3u8 -s sidecar.txt -o output_dir
-\t\t\t\t  threefive hls encode help
+  {BLUE}outputs{U} base64, bytes, hex, int, json, xml, and xmlbin.{U}
 
-{U}{B}    inject   {U}{NORM}{BLUE} Inject an mpegts stream with a SCTE-35 sidecar file at pid:{NORM} threefive inject video.ts with sidecar.txt at 333
+  {BLUE}threefive can read from {U} strings, files, stdin, http(s), multicast, and Udp.
 
-{U}{B}    packets  {U}{NORM}{BLUE} Print raw SCTE-35 packets from multicast mpegts video:{NORM} threefive packets udp://@235.35.3.5:3535
+  Input:{U}    Output:{U}
+ {U}{BLUE} mpegts {U}  {U}{BLUE} base64 {NORM} threefive https://example.com/video.ts  base64
+ {U}{BLUE} xml    {U}  {U}{BLUE} bytes  {NORM} threefive bytes  < xml.xml
+ {U}{BLUE} base64 {U}  {U}{BLUE} hex    {NORM} threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q==' hex
+ {U}{BLUE} xmlbin {U}  {U}{BLUE} int    {NORM} threefive  int  < xml.xml
+ {U}{BLUE} mpegts {U}  {U}{BLUE} json   {NORM} threefive video.ts
+ {U}{BLUE} json   {U}  {U}{BLUE} xml    {NORM} threefive  < json.json  xml
+ {U}{BLUE} hex    {U}  {U}{BLUE} xmlbin {NORM} threefive 0xfc301600000000000000fff00506fe00a98ac700000b3baed9  xmlbin
 
-{U}{B}    proxy    {U}{NORM}{BLUE} Parse a https stream and write raw video to stdout:{NORM} threefive proxy video.ts
+{B}  hls        {U}{NORM} {BLUE} SCTE-35 hls decode help:{U} threefive hls help
 
-{U}{B}    pts      {U}{NORM}{BLUE} Print PTS from mpegts video:{NORM} threefive pts video.ts
+  threefive hls https://example.com/master.m3u8
 
-{U}{B}    sidecar  {U}{NORM}{BLUE} Parse a stream, write pts,write SCTE-35 Cues to sidecar.txt:{NORM} threefive sidecar video.ts
+{B}  hls encode {U} {BLUE} SCTE-35 hls encode help:{U}threefive hls encode help
 
-{U}{B}    sixfix   {U}{NORM}{BLUE} Fix SCTE-35 data mangled by ffmpeg:{NORM} threefive sixfix video.ts
+  threefive hls encode  -i https://example.com/master.m3u8 -s sidecar.txt -o output_dir
 
-{U}{B}    show     {U}{NORM}{BLUE} Probe mpegts video:{NORM} threefive show video.ts
+{B}  inject     {U}{NORM}{BLUE} Inject an mpegts stream with a SCTE-35 sidecar file at pid:{NORM}
 
-{U}{B}    version  {U}{NORM}{BLUE} Show version:{NORM} threefive version
+  threefive inject video.ts with sidecar.txt at 333
 
-{U}{B}    help     {U}{NORM} {BLUE}Help:{NORM} threefive help
+{B}  packets    {U}{NORM}{BLUE} Print raw SCTE-35 packets from multicast mpegts video:{NORM}
 
-"""
+  threefive packets udp://@235.35.3.5:3535
+
+{B}  proxy      {U}{NORM}{BLUE} Parse a https stream and write raw video to stdout:{NORM}
+
+  threefive proxy video.ts
+
+{B}  pts        {U}{NORM}{BLUE} Print PTS from mpegts video:{NORM} threefive pts video.ts
+
+{B}  sidecar    {U}{NORM}{BLUE} Parse a stream, write pts,write SCTE-35 Cues to sidecar.txt:{NORM}
 
+  threefive sidecar video.ts
 
-def read_buff():
-    with reader(sys.stdin.buffer) as stuff:
-        inbuff = stuff.read().decode()
-        return inbuff
+{B}  sixfix     {U}{NORM}{BLUE} Fix SCTE-35 data mangled by ffmpeg:{NORM} threefive sixfix video.ts
+
+{B}  show       {U}{NORM}{BLUE} Probe mpegts video:{NORM} threefive show video.ts
+
+{B}  version    {U}{NORM}{BLUE} Show version:{NORM} threefive version
+
+{B}  help       {U}{NORM} {BLUE}Help:{NORM} threefive help
+
+"""
 
 
 def mk_args(keys):
@@ -100,14 +112,10 @@ def mk_args(keys):
     if no args are present,read from sys.stdin.buffer
     """
     args = [arg for arg in sys.argv[1:] if arg not in keys]
-    if not args:
-        args.append(read_buff())
     return args
 
 
 # print_map functions
-
-
 def hls():
     sys.argv.remove("hls")
     if "encode" in sys.argv:
@@ -279,14 +287,14 @@ def xml_out(cue):
     """
     xml_out prints cue as xml
     """
-    print2(cue.xml())
+    print2(cue.xml(xmlbin=False))
 
 
 def xmlbin_out(cue):
     """
     xml_out prints cue as xml
     """
-    print2(cue.xml(binary=True))
+    print2(cue.xml())
 
 
 funk_map = {
@@ -306,16 +314,20 @@ def funk():
     if a key in out_map
     is also in sys.argv
     """
-    func =json_out
+    func = json_out
     for k, v in funk_map.items():
         if k in sys.argv:
-            func=v
+            func = v
     return func
 
+
 def to_funk(this):
     """
     to_funk prints a cue in a variety of formats.
     """
+    if this == "":
+        return
+
     try:
         # mpegts streams handled here.
         strm = Stream(this)
@@ -323,7 +335,7 @@ def to_funk(this):
         strm.decode(func=func)
     except:  # try to load json or xml
         try:
-            cue=Cue()
+            cue = Cue()
             cue.load(this)
         except:
             try:  # handle base64, bytes, and hex.
@@ -331,11 +343,11 @@ def to_funk(this):
                 cue.decode()
             except:
                 pass
-        if cue:     
+        if cue:
             cue.encode()
             func = funk()
             func(cue)
- 
+
 
 def chk_funk_map():
     """
@@ -343,20 +355,29 @@ def chk_funk_map():
     """
     funk_keys = list(funk_map.keys())
     args = mk_args(funk_keys)
+    readable, _, _ = select.select([sys.stdin], [], [], 0)
+    if sys.stdin in readable:
+        one = reader(sys.stdin.buffer).read(1)
+        if one in [b"{", b"<"]:
+            two = reader(sys.stdin.buffer).read()
+            args.append((one + two).decode())
+        else:
+            reader(sys.stdin.buffer).read(187)
+            Stream(sys.stdin.buffer).decode()
+            sys.exit()
+    if b"" in args:
+        args.remove(b"")
     superfunk = decode
     if [fkey for fkey in funk_keys if fkey in sys.argv]:
         superfunk = to_funk
-    else:
-        superfunk = to_funk 
-    [superfunk(arg) for arg in args]
+    if args:
+        [superfunk(arg) for arg in args]
     sys.exit()
 
 
 if __name__ == "__main__":
     if len(sys.argv) < 2:
-        sys.argv.append('json')
+        sys.argv.append("json")
     chk_print_map()
     chk_mpegts_map()
     chk_funk_map()
-# else:
-#    decode(sys.stdin.buffer)

{threefive-2.4.97 → threefive-2.4.99}/threefive/base.py

@@ -122,7 +122,8 @@ class SCTE35Base:
         has runs hasattr with self and what
         """
         if hasattr(self, what):
-            return True
+            if vars(self)[what]:
+                return True
         return False
 
     def xml(self, ns="scte35"):
@@ -159,7 +160,8 @@ class SCTE35Base:
         if isinstance(stuff, str):
             stuff = json.loads(stuff)
         if isinstance(stuff, dict):
+            prevars= vars(self)
             for k, v in stuff.items():
-                if self.has(k):
+                if k in prevars:
                     self.__dict__[k] = v
-        # self.__dict__.update(stuff)
+            #self.__dict__.update(stuff)

{threefive-2.4.97 → threefive-2.4.99}/threefive/cue.py

@@ -189,12 +189,15 @@ class Cue(SCTE35Base):
         data. Encode is called to set missing fields
         when possible and re-calc the length vars and crc.
         """
-        if self.load(data):
-            bites = self.bites
-            self.encode()
-            return bites
+       # pass
+       # print2("_mk_load")
+       # if self.load(data):
+        #bites = self.bites
+       # self.encode()
+        #return bites
         return data
 
+
     def _mk_bits(self, data):
         """
         cue._mk_bits Converts
@@ -464,9 +467,9 @@ class Cue(SCTE35Base):
             # Self.encode() will calculate lengths and types and such
             self.encode()
 
-    def _xml_binary(self, ns):
+    def _xmlbin(self, ns):
         sig_attrs = {"xmlns": "https://scte.org/schemas/35"}
-        sig_node = Node("Signal", attrs=sig_attrs,ns=ns)
+        sig_node = Node("Signal", attrs=sig_attrs, ns=ns)
         bin_node = Node("Binary", value=self.encode(), ns=ns)
         sig_node.add_child(bin_node)
         return sig_node
@@ -476,19 +479,20 @@ class Cue(SCTE35Base):
         _mk_descriptor_xml make xml nodes for descriptors.
         """
         for d in self.descriptors:
-            if d.has("segmentation_type_id"):
+            if d.has("segmentation_type_id") and d.segmentation_type_id in table22:
                 comment = f"{table22[d.segmentation_type_id]}"
                 sis.add_comment(comment)
             sis.add_child(d.xml(ns=ns))
         return sis
 
-    def xml(self, ns="scte35", binary=False):
+    def xml(self, ns="scte35", xmlbin=True):
         """
         xml returns a threefive.Node instance
         which can be edited as needed or printed.
+        xmlbin
         """
-        if binary:
-            return self._xml_binary(ns=ns)
+        if xmlbin:
+            return self._xmlbin(ns=ns)
         sis = self.info_section.xml(ns=ns)
         # if not self.command:
         #    raise Exception("\033[7mA Splice Command is Required\033[27m")

{threefive-2.4.97 → threefive-2.4.99}/threefive/descriptors.py

@@ -329,8 +329,8 @@ class SegmentationDescriptor(SpliceDescriptor):
         self.device_restrictions = None
         self.segmentation_duration = None
         self.segmentation_message = None
-        self.segmentation_upid_length = None
         self.segmentation_type_id = None
+        self.segmentation_upid_length = None
         self.segmentation_upid_type = None
         self.segmentation_upid_type_name = None
         self.segmentation_upid = None
@@ -540,17 +540,16 @@ class SegmentationDescriptor(SpliceDescriptor):
             self.segmentation_upid_type_name, self.segmentation_upid = the_upid.decode()
 
     def _upid_from_xml(self, stuff):
-        if "SegmentationUpid" in stuff:
-            if "segmentation_upid" not in stuff["SegmentationUpid"]:
+        if "SegmentationUpid" in stuff['SegmentationDescriptor']:
+            sdsu=stuff['SegmentationDescriptor']["SegmentationUpid"]
+            if "segmentation_upid" not in sdsu:
                 self.segmentation_upid_type = 0
                 self.segmentation_upid_length = 0
                 self.segmentation_upid = ""
             else:
-                seg_upid = stuff["SegmentationUpid"]["segmentation_upid"]
-                if "segmentation_upid_type" in stuff["SegmentationUpid"]:
-                    self.segmentation_upid_type = stuff["SegmentationUpid"][
-                        "segmentation_upid_type"
-                    ]
+                seg_upid = sdsu["segmentation_upid"]
+                if "segmentation_upid_type" in sdsu:
+                    self.segmentation_upid_type = sdsu["segmentation_upid_type"]
                     self.segmentation_upid_type_name = upid_map[
                         self.segmentation_upid_type
                     ][0]
@@ -560,18 +559,20 @@ class SegmentationDescriptor(SpliceDescriptor):
         """
         Load a SegmentationDescriptor from XML
         """
-        self.load(stuff["SegmentationDescriptor"])
+        ssd = stuff["SegmentationDescriptor"]
+        self.load(ssd)
         self.segmentation_event_id_compliance_indicator = True
         self.program_segmentation_flag = True
         self.segmentation_duration_flag = False
-        if "segmentationDuration" in stuff["SegmentationDescriptor"]:
+        if "segmentationDuration" in ssd:
             self.segmentation_duration_flag = True
         self.delivery_not_restricted_flag = True
         if "DeliveryRestrictions" in stuff:
+            sdr = stuff["DeliveryRestrictions"]
             self.delivery_not_restricted_flag = False
-            self.load(stuff["DeliveryRestrictions"])
-            self.device_restrictions = table20[self.device_restrictions]
-        self.segmentation_event_id = hex(self.segmentation_event_id)
+            self.load(sdr)
+            self.device_restrictions = table20[sdr["device_restrictions"]]
+        self.segmentation_event_id = hex(ssd["segmentation_event_id"])
         if self.segmentation_type_id in table22:
             self.segmentation_message = table22[self.segmentation_type_id]
         self._upid_from_xml(stuff)