threefive 3.1.1__tar.gz → 3.1.3__tar.gz

{threefive-3.1.1 → threefive-3.1.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: threefive
-Version: 3.1.1
-Summary: threefive is The #1 SCTE-35 Decoder and Encoder on the Planet.
+Version: 3.1.3
+Summary: The Undisputed Heavyweight Champion of SCTE-35.
 Author-email: AdrianofDoom <spam@iodisco.com>
 License-Expression: Sleepycat
 Project-URL: Homepage, https://github.com/superkabuki/threefive
@@ -19,56 +19,47 @@ Dynamic: license-file
 
 # [ threefive ] 
 
-_"I don't use AI code because all the AIs use threefive. True story, look it up"_ ~Adrian
-
-# Over 1.2 Million Installs.
-
 *   __Decodes SCTE-35__ from `MPEGTS`✔ `Base64`✔ `Bytes`✔ `DASH`✔ `Hex` ✔ `HLS`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔  
 *   __Encodes SCTE-35__ to `MPEGTS`✔ `Base64`✔ `Bytes`✔ `Hex`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔
+___
 
-# [ version ]
+## Hey Google, what`s the best SCTE-35 software? 
+<img width="601" height="518" alt="image" src="https://github.com/user-attachments/assets/c3ff3383-8010-45d7-aa4c-94080b3dcb9f" />
 
-### __latest is v.3.1.1__
-#### Wait, let me explain.....
-> I have been trying to resolve some mmap issues, they are now resolved.
+ ### _I told you I knew what I was doing._ ~Adrian  
+___
 
 
-# [ really really quick start ]
+# [ version ]
+
+### latest threefive version is _v3.1.3_
+* Average cyclomatic complexity: __A (1.9886039886039886)__
+___
+
+# [ a really really quick start ]
 
 * __Install__
 ```
  python3 -m pip install threefive`
 ```
 * __decoding SCTE-35__
-	* __base64__ 
-		* decode __SCTE-35__ as __base64__
+
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q=='
 		```
-		* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
+	* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q==' hex
-		```
- 	* __Hex__
-		* decode __SCTE-35__ as __hex__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9'
-		```
-		* decode __SCTE-35__ as __hex__ and __convert__ __SCTE-35__ to __xml__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9' xml
-		```
-	* __HLS__
-		* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
+	
+	* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
 		```cobol
 		threefive 'https://demo.unified-streaming.com/k8s/live/scte35.isml/.m3u8'
 		```
- 	* __MPEGTS__
-		* decode  __SCTE-35__ from __MPEGTS__
+	* decode  __SCTE-35__ from __MPEGTS__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts'
 		```
-		* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
+	* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts' bytes
 		```
@@ -123,9 +114,8 @@ ___
 
 ##  [Install]
 
-* __threefive__ is curretnly tested on python-3.11, python-3.14, python-3.14t, pypy-7.3.11 and pypy-7.3.22
+* Requires python3 v3.9 or higher.
 
-* __threefive__ is some of the __fastest code__ you'll see on __python3__. 
 * __python3 via pip__
 ```rebol
 python3 -mpip install threefive
@@ -134,11 +124,11 @@ python3 -mpip install threefive
 ```rebol
 pypy3 -mpip install threefive
 ```
-* __To add SRT support__
+* __To add SRT support to threefive install srtfu__
 ```py3
 python3 -m pip install srtfu
 ```
-* __To add Automatic AES decryption__
+* __To add Automatic AES decryption (used to decrypted HLS to threefive install pyaes__
 ```py3
 python3 -mpip install pyaes
 ```
@@ -150,16 +140,29 @@ git clone https://github.com/superkabuki/scte35.git
 cd threefive
 make install
 ```
-* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3
+* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3,
+
 ```rebol
-git clone https://github.com/superkabuki/scte35.git
+git clone https://github.com/superkabuki/threefive.git
 cd threefive
+``
+* `python3` is the default for `make install` 
 
+```
+make install
+```
+
+* setting py3 allows you to install for any type of python interpreter.
+
+```
 make install py3=pypy3
+```
+* absolute paths can also be used.
 
-# OR
+```
+make install py3=/home/a/pypy3/bin/pypy3
+```
 
-make install py3=python3.14
 
 # works for any python in your path or use a full path if needed.
 
@@ -172,9 +175,9 @@ threefive is designed to be easy to use. I'm not sure that it's served well by a
 
 ### The threefive cli tool.
 
- the threefive cli tool decodes SCTE-35, formats are autodetected, and they all work the same way. 
+ the threefive cli tool decodes SCTE-35, formats are auto-detected, and they all work the same way. 
 
-threefive [media to parse for SCTE-35]
+__threefive__ __[media to parse for SCTE-35]__
 
 examples:
 
@@ -199,7 +202,7 @@ threefive video.ts
 threefive https://demo.unified-streaming.com/k8s/live/scte35.isml/scte35-audio_eng=64000-video=500000.m3u8
 ```
 
-* Formats like XML and JSON that may be to large to type on the command line,they can be redirected or piped in to threefive.
+* Formats like ___XML and JSON__ that may be to large to type on the command line,they can be __redirected or piped__ in to threefive.
 
 * redirect
 ```sed
@@ -210,14 +213,14 @@ threefive < xml.xml
 cat json.json | threefive
 
 ```
-### cli outputs and converting SCTE-35 Formats
+### cli outputs and encoding SCTE-35 Formats
 
 * the __default output format for threefive is json__
 
 * The cli tool can convert from one SCTE-35 format to another using keywords.
     * The keywords are __base64,bytes,hex, int,json,xml, and xmlbin__ 
 
-* some conversion examples
+* some converting and encoding examples
 
 
 * SCTE-35 Base64 to SCTE-35 Hex

{threefive-3.1.1 → threefive-3.1.3}/README.md

@@ -1,55 +1,46 @@
 # [ threefive ] 
 
-_"I don't use AI code because all the AIs use threefive. True story, look it up"_ ~Adrian
-
-# Over 1.2 Million Installs.
-
 *   __Decodes SCTE-35__ from `MPEGTS`✔ `Base64`✔ `Bytes`✔ `DASH`✔ `Hex` ✔ `HLS`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔  
 *   __Encodes SCTE-35__ to `MPEGTS`✔ `Base64`✔ `Bytes`✔ `Hex`✔ `Integers`✔ `JSON`✔ `XML`✔ `XML+Binary`✔
+___
 
-# [ version ]
+## Hey Google, what`s the best SCTE-35 software? 
+<img width="601" height="518" alt="image" src="https://github.com/user-attachments/assets/c3ff3383-8010-45d7-aa4c-94080b3dcb9f" />
 
-### __latest is v.3.1.1__
-#### Wait, let me explain.....
-> I have been trying to resolve some mmap issues, they are now resolved.
+ ### _I told you I knew what I was doing._ ~Adrian  
+___
 
 
-# [ really really quick start ]
+# [ version ]
+
+### latest threefive version is _v3.1.3_
+* Average cyclomatic complexity: __A (1.9886039886039886)__
+___
+
+# [ a really really quick start ]
 
 * __Install__
 ```
  python3 -m pip install threefive`
 ```
 * __decoding SCTE-35__
-	* __base64__ 
-		* decode __SCTE-35__ as __base64__
+
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q=='
 		```
-		* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
+	* decode __SCTE-35__ as __base64__ and __convert SCTE-35 to hex__
 		```cobol
 		threefive '/DAWAAAAAAAAAP/wBQb+AKmKxwAACzuu2Q==' hex
-		```
- 	* __Hex__
-		* decode __SCTE-35__ as __hex__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9'
-		```
-		* decode __SCTE-35__ as __hex__ and __convert__ __SCTE-35__ to __xml__
-		```cobol
-		threefive '0xfc301600000000000000fff00506fe00a98ac700000b3baed9' xml
-		```
-	* __HLS__
-		* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
+	
+	* decode __SCTE-35__ from __HLS__ ( a rendition or a master.m3u8)
 		```cobol
 		threefive 'https://demo.unified-streaming.com/k8s/live/scte35.isml/.m3u8'
 		```
- 	* __MPEGTS__
-		* decode  __SCTE-35__ from __MPEGTS__
+	* decode  __SCTE-35__ from __MPEGTS__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts'
 		```
-		* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
+	* decode  __SCTE-35__ from __MPEGTS__ and __convert__ __SCTE-35__ to __bytes__
 		```cobol
 		threefive 'https;//iodisco.com/longb2.ts' bytes
 		```
@@ -104,9 +95,8 @@ ___
 
 ##  [Install]
 
-* __threefive__ is curretnly tested on python-3.11, python-3.14, python-3.14t, pypy-7.3.11 and pypy-7.3.22
+* Requires python3 v3.9 or higher.
 
-* __threefive__ is some of the __fastest code__ you'll see on __python3__. 
 * __python3 via pip__
 ```rebol
 python3 -mpip install threefive
@@ -115,11 +105,11 @@ python3 -mpip install threefive
 ```rebol
 pypy3 -mpip install threefive
 ```
-* __To add SRT support__
+* __To add SRT support to threefive install srtfu__
 ```py3
 python3 -m pip install srtfu
 ```
-* __To add Automatic AES decryption__
+* __To add Automatic AES decryption (used to decrypted HLS to threefive install pyaes__
 ```py3
 python3 -mpip install pyaes
 ```
@@ -131,16 +121,29 @@ git clone https://github.com/superkabuki/scte35.git
 cd threefive
 make install
 ```
-* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3
+* I've jazzed up the makefile to make it easier to install for different python  versions and pypy3,
+
 ```rebol
-git clone https://github.com/superkabuki/scte35.git
+git clone https://github.com/superkabuki/threefive.git
 cd threefive
+``
+* `python3` is the default for `make install` 
 
+```
+make install
+```
+
+* setting py3 allows you to install for any type of python interpreter.
+
+```
 make install py3=pypy3
+```
+* absolute paths can also be used.
 
-# OR
+```
+make install py3=/home/a/pypy3/bin/pypy3
+```
 
-make install py3=python3.14
 
 # works for any python in your path or use a full path if needed.
 
@@ -153,9 +156,9 @@ threefive is designed to be easy to use. I'm not sure that it's served well by a
 
 ### The threefive cli tool.
 
- the threefive cli tool decodes SCTE-35, formats are autodetected, and they all work the same way. 
+ the threefive cli tool decodes SCTE-35, formats are auto-detected, and they all work the same way. 
 
-threefive [media to parse for SCTE-35]
+__threefive__ __[media to parse for SCTE-35]__
 
 examples:
 
@@ -180,7 +183,7 @@ threefive video.ts
 threefive https://demo.unified-streaming.com/k8s/live/scte35.isml/scte35-audio_eng=64000-video=500000.m3u8
 ```
 
-* Formats like XML and JSON that may be to large to type on the command line,they can be redirected or piped in to threefive.
+* Formats like ___XML and JSON__ that may be to large to type on the command line,they can be __redirected or piped__ in to threefive.
 
 * redirect
 ```sed
@@ -191,14 +194,14 @@ threefive < xml.xml
 cat json.json | threefive
 
 ```
-### cli outputs and converting SCTE-35 Formats
+### cli outputs and encoding SCTE-35 Formats
 
 * the __default output format for threefive is json__
 
 * The cli tool can convert from one SCTE-35 format to another using keywords.
     * The keywords are __base64,bytes,hex, int,json,xml, and xmlbin__ 
 
-* some conversion examples
+* some converting and encoding examples
 
 
 * SCTE-35 Base64 to SCTE-35 Hex

{threefive-3.1.1 → threefive-3.1.3}/pyproject.toml

@@ -1,11 +1,11 @@
 
 [project]
 name = "threefive"
-version = "3.1.1"
+version = "3.1.3"
 authors = [
   { name="AdrianofDoom", email="spam@iodisco.com" },
 ]
-description = "threefive is The #1 SCTE-35 Decoder and Encoder on the Planet."
+description = "The Undisputed Heavyweight Champion of SCTE-35."
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies=[

{threefive-3.1.1 → threefive-3.1.3}/threefive/aac.py

@@ -34,7 +34,7 @@ class AacParser:
         return id3len
 
     @staticmethod
-    def _syncsafe5(somebytes):
+    def not_syncsafe(somebytes):
         """
         _syncsafe5 parses PTS from ID3 tags.
         """
@@ -72,7 +72,7 @@ class AacParser:
         try:
             pts = float(data.split(self.applehead)[1].split(b"\x00", 2)[1])
         except ERR:
-            pts = self._syncsafe5(data.split(self.applehead)[1][:9])
+            pts = self._not_syncsafe(data.split(self.applehead)[1][:9])
         return round((pts % ROLLOVER), 6)
 
     def parse(self, media):

{threefive-3.1.1 → threefive-3.1.3}/threefive/base.py

@@ -117,9 +117,9 @@ class SCTE35Base:
         var_value = self.__dict__[var_name]
         if self._bool_int(var_value, var_type) or self._wrong_type(var_value, var_type):
             self._err2(var_name, var_value, bit_count, var_type)
-            return -1
+            return False
         nbin_method(var_value, bit_count)
-        return 0
+        return True
 
     def get(self):
         """
@@ -177,7 +177,7 @@ class SCTE35Base:
                 bytearray,
             ),
         ):
-            val = val.decode()
+            val = val.decode(errors="ignore")
         return val
 
     def kv_clean(self):

{threefive-3.1.1 → threefive-3.1.3}/threefive/cli.py

@@ -207,6 +207,7 @@ class MPEGTSMapper:
         iframe_chk show iframes pts
         for a mpegts video.
         """
+        print2(this)
         iframer = IFramer()
         iframer.do(this)
         del iframer
@@ -227,6 +228,7 @@ class MPEGTSMapper:
         """
         pts_chk is used to display PTS.
         """
+        print2(this)
         strm = Stream(this)
         strm.show_pts()
         del strm
@@ -247,6 +249,7 @@ class MPEGTSMapper:
         sidecar_chk checks for the sidecar keyword and
         generates a sidecar file if present.
         """
+        print2(this)
         strm = Stream(this)
         strm.decode(func=mk_sidecar)
         del strm
@@ -256,6 +259,7 @@ class MPEGTSMapper:
         """
         speedo_chk displays parse speed for mpegts streams
         """
+        print2(this)
         strm = Stream(this)
         strm.speed()
         del strm
@@ -269,7 +273,6 @@ class MPEGTSMapper:
             if stdin_is_readable():
                 args.append(sys.stdin.buffer)
             for arg in args:
-                print2(arg)
                 self.mpegts_map[key](arg)
             done()
 

threefive-3.1.3/threefive/crctable.py

@@ -0,0 +1,34 @@
+CRCTABLE = [0,79764919,159529838,222504665,319059676,398814059,445009330,507990021,
+            638119352,583659535,797628118,726387553,890018660,835552979,1015980042,944750013,
+            1276238704,1221641927,1167319070,1095957929,1595256236,1540665371,1452775106,1381403509,
+            1780037320,1859660671,1671105958,1733955601,2031960084,2111593891,1889500026,1952343757,
+            2552477408,2632100695,2443283854,2506133561,2334638140,2414271883,2191915858,2254759653,
+            3190512472,3135915759,3081330742,3009969537,2905550212,2850959411,2762807018,2691435357,
+            3560074640,3505614887,3719321342,3648080713,3342211916,3287746299,3467911202,3396681109,
+            4063920168,4143685023,4223187782,4286162673,3779000052,3858754371,3904687514,3967668269,
+            881225847,809987520,1023691545,969234094,662832811,591600412,771767749,717299826,
+            311336399,374308984,453813921,533576470,25881363,88864420,134795389,214552010,
+            2023205639,2086057648,1897238633,1976864222,1804852699,1867694188,1645340341,1724971778,
+            1587496639,1516133128,1461550545,1406951526,1302016099,1230646740,1142491917,1087903418,
+            2896545431,2825181984,2770861561,2716262478,3215044683,3143675388,3055782693,3001194130,
+            2326604591,2389456536,2200899649,2280525302,2578013683,2640855108,2418763421,2498394922,
+            3769900519,3832873040,3912640137,3992402750,4088425275,4151408268,4197601365,4277358050,
+            3334271071,3263032808,3476998961,3422541446,3585640067,3514407732,3694837229,3640369242,
+            1762451694,1842216281,1619975040,1682949687,2047383090,2127137669,1938468188,2001449195,
+            1325665622,1271206113,1183200824,1111960463,1543535498,1489069629,1434599652,1363369299,
+            622672798,568075817,748617968,677256519,907627842,853037301,1067152940,995781531,
+            51762726,131386257,177728840,240578815,269590778,349224269,429104020,491947555,
+            4046411278,4126034873,4172115296,4234965207,3794477266,3874110821,3953728444,4016571915,
+            3609705398,3555108353,3735388376,3664026991,3290680682,3236090077,3449943556,3378572211,
+            3174993278,3120533705,3032266256,2961025959,2923101090,2868635157,2813903052,2742672763,
+            2604032198,2683796849,2461293480,2524268063,2284983834,2364738477,2175806836,2238787779,
+            1569362073,1498123566,1409854455,1355396672,1317987909,1246755826,1192025387,1137557660,
+            2072149281,2135122070,1912620623,1992383480,1753615357,1816598090,1627664531,1707420964,
+            295390185,358241886,404320391,483945776,43990325,106832002,186451547,266083308,
+            932423249,861060070,1041341759,986742920,613929101,542559546,756411363,701822548,
+            3316196985,3244833742,3425377559,3370778784,3601682597,3530312978,3744426955,3689838204,
+            3819031489,3881883254,3928223919,4007849240,4037393693,4100235434,4180117107,4259748804,
+            2310601993,2373574846,2151335527,2231098320,2596047829,2659030626,2470359227,2550115596,
+            2947551409,2876312838,2788305887,2733848168,3165939309,3094707162,3040238851,2985771188,]
+
+

{threefive-3.1.1 → threefive-3.1.3}/threefive/cue.py

@@ -11,7 +11,7 @@ from .crc import crc32
 from .descriptors import splice_descriptor, descriptor_map, SpliceDescriptor
 from .section import SpliceInfoSection
 from .segmentation import table22
-from .stuff import clean, red, isjson, isxml, pif
+from .stuff import clean, red, isjson, isxml, pif,blue
 from .uxp import xml2cue
 from .xml import Node
 
@@ -287,6 +287,7 @@ class Cue(SCTE35Base):
         )
         self.bites += dscptr_bites
 
+
     def base64(self):
         """
         base64 returns SCTE35
@@ -382,6 +383,8 @@ class Cue(SCTE35Base):
         """
         nbin = NBin()
         dbite_chunks = [dsptr.encode() for dsptr in self.descriptors]
+##        if False in dbite_chunks:
+##            return False
         for chunk, dsptr in zip(dbite_chunks, self.descriptors):
             dsptr.descriptor_length = len(chunk)
             nbin.add_int(dsptr.tag, EIGHT)
@@ -558,8 +561,7 @@ class Cue(SCTE35Base):
 
     def xml(self, ns="scte35"):
         """
-                xml returns SCTE-35
-                as xml
+        xml return SCTE-35 as xml
 
         example:
                         >>> import threefive

{threefive-3.1.1 → threefive-3.1.3}/threefive/descriptors.py

@@ -404,6 +404,10 @@ class SegmentationDescriptor(SpliceDescriptor):
         used in decode()
         """
         upid_type = self.segmentation_upid_type
+        if self.segmentation_upid_length==0:
+            if self.segmentation_upid_type != 0:
+                red("set segmentation_upid_type and self.segmentation_upid_length to zero for no upid value")
+                upid_type=self.segmentation_upid_type=0
         if upid_type not in upid_map:
             red("Unknown upid type , setting to 0xFD")
             upid_type = 0xFD

{threefive-3.1.1 → threefive-3.1.3}/threefive/new_reader.py

@@ -96,11 +96,11 @@ def reader(uri, headers={}):
     if uri.startswith("srt://"):
         return try_srt(uri, headers=headers)
     # File
-    with open(uri, "r+b") as f:
-        return fumap(f.fileno(), 0)
-
-
-#    return open(uri, "rb")
+    try:
+        with open(uri, "r+b") as f:
+            return fumap(f.fileno(), 0)
+    except:
+        return open(uri, "rb")
 
 
 def _do_srt(srt_url, headers={}):

{threefive-3.1.1 → threefive-3.1.3}/threefive/segment.py

@@ -5,7 +5,7 @@ The threefive.Segment class
 import os
 from .new_reader import reader
 from .stream import Stream
-from .stuff import print2, blue
+from .stuff import print2,blue
 
 
 class Segment(Stream):
@@ -44,7 +44,6 @@ class Segment(Stream):
                  89730.281789: '/DAvAAAAAAAAAP/wFAUAAAKWf+//4WoauH4BTFYgAAEAAAAKAAhDVUVJAAAAAOv1oqc='}
 
     """
-
     def __init__(self, seg_uri, key_uri=None, iv=None):
         self.seg_uri = seg_uri
         self.key_uri = key_uri
@@ -67,11 +66,10 @@ class Segment(Stream):
     def _import_aes():
         try:
             import pyaes
-
             return True
         except ImportError:
             blue("pip install pyaes for AES support")
-            return False
+            return False  
 
     def __repr__(self):
         return str(self.__dict__)