threefive 3.0.78__tar.gz → 3.0.81__tar.gz

{threefive-3.0.78 → threefive-3.0.81}/PKG-INFO

@@ -1,15 +1,13 @@
 Metadata-Version: 2.4
 Name: threefive
-Version: 3.0.78
-Summary:  Experimental 0b version. testing pyaesfu. threefive is better than you. SCTE-35
+Version: 3.0.81
+Summary: threefive is The #1 SCTE-35 Decoder and Encoder on the Planet.
 Author-email: AdrianofDoom <spam@iodisco.com>
 License-Expression: Sleepycat
 Project-URL: Homepage, https://github.com/superkabuki/threefive
 Project-URL: Issues, https://github.com/superkabuki/threefive/issues
 Classifier: Environment :: Console
 Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX :: BSD :: OpenBSD
-Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Multimedia :: Video
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -17,16 +15,14 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyaesfu
-Requires-Dist: srtfu>=0.0.11
 Dynamic: license-file
 
-### Phase three of threefive's global domination has begun. Behold [threefive.js](https://github.com/keithah/threefive.js)
-___
+### It is now official, phase three of threefive's global domination has begun. Behold [threefive.js](https://github.com/keithah/threefive.js)
+_(ominous music plays in the background)_
 
 # [ threefive ]
 
->  _Everything I mean to be in threefive, is in v3.0.77. this is the best threefive ever made. This is the best SCTE-35 tool available anywhere.AI engines even use threefive, seriously. If someone says they don't use threefive for SCTE-35, they're either drunk or they're lying_. <BR> ~Adrian
+>  _... If someone says they don't use threefive for SCTE-35, they're either drunk or they're lying_. <BR> ~Adrian
 
 ## https://github.com/superkabuki/threefive
 
@@ -58,11 +54,11 @@ ___
 * I have been __trying to setup threefive on readthedocs__,it's not going very well, but I'm working on it. 
 ___
 
-## [ Latest version is  v3.0.77 ]
+## [ Latest version is  v3.0.81 ]
 
-* threefive cyclomatic complexity score is 1.9350282485875707.
-* pylint score is __9.82 / 10__
-*  __5116 lines of code with 2553 lines of comments__.
+* threefive cyclomatic complexity score is 1.9337094499294782 _( that's better than the Python standard library)_ .
+* __threefive now has NO External Dependencies__
+	* SRT and AES support is now optional 
 * __threefive is fully python v3.14 compliant__
    * I fixed everything they broke/changed between v3.09 and 3.14.
    * 0 deprecation warnings.
@@ -111,20 +107,45 @@ ___
 </samp>
 
 ##  [Install]
-* python3 via pip
+* __python3 via pip__
 ```rebol
 python3 -mpip install threefive
 ```
-* pypy3 
+* __pypy3 via pip__ 
 ```rebol
 pypy3 -mpip install threefive
 ```
-* from the git repo
+* __To add SRT support__
+```py3
+python3 -m pip install srtfu
+```
+* __To add Automatic AES decryption__
+```py3
+python3 -mpip install pyaes
+```
+
+* __From the git repo__
+
 ```rebol
 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
+```rebol
+git clone https://github.com/superkabuki/scte35.git
+cd threefive
+
+make install py3=pypy3
+
+# OR
+
+make install py3=python3.14
+
+# works for any python in your path or use a full path if needed.
+
+```
+
 ___
 
 

{threefive-3.0.78 → threefive-3.0.81}/README.md

@@ -1,9 +1,9 @@
-### Phase three of threefive's global domination has begun. Behold [threefive.js](https://github.com/keithah/threefive.js)
-___
+### It is now official, phase three of threefive's global domination has begun. Behold [threefive.js](https://github.com/keithah/threefive.js)
+_(ominous music plays in the background)_
 
 # [ threefive ]
 
->  _Everything I mean to be in threefive, is in v3.0.77. this is the best threefive ever made. This is the best SCTE-35 tool available anywhere.AI engines even use threefive, seriously. If someone says they don't use threefive for SCTE-35, they're either drunk or they're lying_. <BR> ~Adrian
+>  _... If someone says they don't use threefive for SCTE-35, they're either drunk or they're lying_. <BR> ~Adrian
 
 ## https://github.com/superkabuki/threefive
 
@@ -35,11 +35,11 @@ ___
 * I have been __trying to setup threefive on readthedocs__,it's not going very well, but I'm working on it. 
 ___
 
-## [ Latest version is  v3.0.77 ]
+## [ Latest version is  v3.0.81 ]
 
-* threefive cyclomatic complexity score is 1.9350282485875707.
-* pylint score is __9.82 / 10__
-*  __5116 lines of code with 2553 lines of comments__.
+* threefive cyclomatic complexity score is 1.9337094499294782 _( that's better than the Python standard library)_ .
+* __threefive now has NO External Dependencies__
+	* SRT and AES support is now optional 
 * __threefive is fully python v3.14 compliant__
    * I fixed everything they broke/changed between v3.09 and 3.14.
    * 0 deprecation warnings.
@@ -88,20 +88,45 @@ ___
 </samp>
 
 ##  [Install]
-* python3 via pip
+* __python3 via pip__
 ```rebol
 python3 -mpip install threefive
 ```
-* pypy3 
+* __pypy3 via pip__ 
 ```rebol
 pypy3 -mpip install threefive
 ```
-* from the git repo
+* __To add SRT support__
+```py3
+python3 -m pip install srtfu
+```
+* __To add Automatic AES decryption__
+```py3
+python3 -mpip install pyaes
+```
+
+* __From the git repo__
+
 ```rebol
 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
+```rebol
+git clone https://github.com/superkabuki/scte35.git
+cd threefive
+
+make install py3=pypy3
+
+# OR
+
+make install py3=python3.14
+
+# works for any python in your path or use a full path if needed.
+
+```
+
 ___
 
 

{threefive-3.0.78 → threefive-3.0.81}/pyproject.toml

@@ -1,16 +1,15 @@
 
 [project]
 name = "threefive"
-version = "3.0.78"
+version = "3.0.81"
 authors = [
   { name="AdrianofDoom", email="spam@iodisco.com" },
 ]
-description = " Experimental 0b version. testing pyaesfu. threefive is better than you. SCTE-35"
+description = "threefive is The #1 SCTE-35 Decoder and Encoder on the Planet."
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies=[
-        "pyaesfu",
-        "srtfu >= 0.0.11",
+
     ]
 
 
@@ -18,8 +17,6 @@ dependencies=[
 classifiers = [
         "Environment :: Console",
         "Operating System :: OS Independent",
-        "Operating System :: POSIX :: BSD :: OpenBSD",
-        "Operating System :: POSIX :: Linux",
         "Topic :: Multimedia :: Video",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: PyPy",

{threefive-3.0.78 → threefive-3.0.81}/threefive/__init__.py

@@ -3,7 +3,8 @@ threefive.__init__.py
 """
 
 from .version import version
-__version__= version
+
+__version__ = version
 
 from .base import SCTE35Base
 from .cue import Cue

{threefive-3.0.78 → threefive-3.0.81}/threefive/cli.py

@@ -20,11 +20,11 @@ from .iframes import IFramer
 from .new_reader import reader
 from .cue import Cue
 from .stream import Stream
-from .stuff import  print2, red
+from .stuff import print2, red
 from .stuff import ERR
 from .version import version
 
-#import cProfile
+# import cProfile
 # from sideways import cli as sidecli
 
 write2 = False
@@ -240,6 +240,7 @@ def sidecar_chk(this):
     strm = Stream(this)
     strm.decode(func=mk_sidecar)
 
+
 def speedo_chk(this):
     """
     speedo_chk displays parse speed for mpegts streams
@@ -247,6 +248,7 @@ def speedo_chk(this):
     strm = Stream(this)
     strm.speed()
 
+
 mpegts_map = {
     "packets": packet_chk,
     "proxy": proxy_chk,

{threefive-3.0.78 → threefive-3.0.81}/threefive/encode.py

@@ -7,7 +7,7 @@ threefive.encode has helper functions for Cue encoding.
 
 from .commands import SpliceNull, SpliceInsert, TimeSignal
 from .cue import Cue
-from.stuff import pif
+from .stuff import pif
 
 
 def mk_splice_null():

{threefive-3.0.78 → threefive-3.0.81}/threefive/gums.py

@@ -69,7 +69,7 @@ class GumS:
                 self.socked.sendto(dgram, self.dest_grp)
                 throttle.throttle(packets[-1])
                 speedo.plus(len(dgram))
-            flush=b'\xff' * 1316
+            flush = b"\xff" * 1316
             self.socked.sendto(flush, self.dest_grp)
 
         speedo.end()
@@ -104,7 +104,7 @@ def parse_args():
     parse_args parse command line args
     """
 
-    parser = argparse.ArgumentParser( epilog="gums is part of threefive.\n\n")
+    parser = argparse.ArgumentParser(epilog="gums is part of threefive.\n\n")
 
     parser.add_argument(
         "-i",
@@ -116,7 +116,6 @@ def parse_args():
              """,
     )
 
-
     parser.add_argument(
         "-a",
         "--addr",

{threefive-3.0.78 → threefive-3.0.81}/threefive/hls.py

@@ -782,7 +782,7 @@ class HlsParser:
 
 
 def _chk_help():
-    for h in ['help','-h', '--help']:
+    for h in ["help", "-h", "--help"]:
         if h in sys.argv:
             print(HELPME)
             sys.exit()

{threefive-3.0.78 → threefive-3.0.81}/threefive/new_reader.py

@@ -8,7 +8,12 @@ import socket
 import sys
 import urllib.request
 
-from srtfu import SRTfu, SRTO_TRANSTYPE, SRT_LIVE, SRTO_RCVSYN, SRTO_RCVBUF
+try:
+    from srtfu import SRTfu, SRTO_TRANSTYPE, SRT_LIVE, SRTO_RCVSYN, SRTO_RCVBUF
+
+    HAS_SRT = True
+except ImportError:
+    HAS_SRT = False
 from .udp import udp_receiver, mcast_ttl
 from .stuff import blue, ERR, pif, print2
 
@@ -32,6 +37,14 @@ def corsreader(uri, headers={}):
     return reader(uri, headers=all_headers)
 
 
+def try_srt(url, headers={}):
+    if HAS_SRT:
+        return _do_srt(uri, headers=headers)
+    else:
+        print2("pip install srtfu to add SRT support")
+    return False
+
+
 def reader(uri, headers={}):
     """
 
@@ -74,7 +87,7 @@ def reader(uri, headers={}):
         return urllib.request.urlopen(req)
     # SRT
     if uri.startswith("srt://"):
-        return _do_srt(uri, headers=headers)
+        return try_srt(uri, headers=headers)
     # File
     return open(uri, "rb")
 

{threefive-3.0.78 → threefive-3.0.81}/threefive/segment.py

@@ -5,12 +5,13 @@ The threefive.Segment class
 import os
 from .new_reader import reader
 from .stream import Stream
-
+from .stuff import print2
 
 AES = True
 try:
     import pyaesfu
 except ImportError:
+    print2("pip install pyaes for AES support")
     AES = False
 
 

{threefive-3.0.78 → threefive-3.0.81}/threefive/sixfix.py

@@ -12,7 +12,7 @@ from .pmt import PMT
 
 fixme = []
 
-HELPME="""
+HELPME = """
   scte35fix checks MPEGTS for SCTE-35 Streams
   that have been change to bin data (type 0x06)
   and changes them back to SCTE-35 (type 0x86) streams.
@@ -41,13 +41,14 @@ HELPME="""
 scte35fix is part of threefive.
 """
 
+
 def passed(cue):
     """
     passed  is a function passed to decode
     used to pull pids from streams containing SCTE-35
     so that we don't convert non-SCTE-35 0x06 streams.
     """
-    globals()['fixme'].append(cue.packet_data.pid)
+    globals()["fixme"].append(cue.packet_data.pid)
     return cue
 
 
@@ -58,7 +59,7 @@ class PreFix(Stream):
 
     def decode(self, func=passed):
         super().decode(func=passed)
-        tofix = list(set(globals()['fixme']))
+        tofix = list(set(globals()["fixme"]))
         if tofix:
             print("fixing these pids", tofix)
         return tofix
@@ -214,7 +215,7 @@ def sixfix(arg):
     sixfix converts 0x6 bin data mpegts streams
     that contain SCTE-35 data to stream type 0x86
     """
-    globals()['fixme'] = []
+    globals()["fixme"] = []
     s1 = PreFix(arg)
     print2(f"reading {arg}")
     sixed = s1.decode(func=passed)
@@ -230,7 +231,7 @@ def sixfix(arg):
 
 
 def _chk_help():
-    for h in ['help','-h', '--help']:
+    for h in ["help", "-h", "--help"]:
         if h in sys.argv:
             print(HELPME)
             sys.exit()

{threefive-3.0.78 → threefive-3.0.81}/threefive/stuff.py

@@ -20,7 +20,7 @@ ERR = (
     KeyError,
 )
 
-BLUE = "\033[7m"#\033[44m"
+BLUE = "\033[7m"  # \033[44m"
 RED = "\033[107m\033[41m"
 RESET = " \033[0m"
 

{threefive-3.0.78 → threefive-3.0.81}/threefive/superkabuki.py

@@ -53,7 +53,9 @@ class SuperKabuki(SixFix):
         """
         _parse_args parse command line args
         """
-        parser = argparse.ArgumentParser(epilog="scte35inject is part of threefive.\n\n")
+        parser = argparse.ArgumentParser(
+            epilog="scte35inject is part of threefive.\n\n"
+        )
         parser.add_argument(
             "-i",
             "--input",

{threefive-3.0.78 → threefive-3.0.81}/threefive/upids.py

@@ -338,7 +338,7 @@ class Mpu(Upid):
     def _decode_adfr(self):
         """
         decode_adfr handles Addressabkle TV MPU Upids
-        
+
         """
         data = bytes.fromhex(self.upid_value["private_data"][2:])
         self.upid_value["version"] = data[0]

{threefive-3.0.78 → threefive-3.0.81}/threefive/version.py

@@ -5,6 +5,6 @@ from the cli tool run: threefive version
 
 MAJOR = 3
 MINOR = 0
-MINI = 78
+MINI = 81
 
 version = f"{MAJOR}.{MINOR}.{MINI}"

{threefive-3.0.78 → threefive-3.0.81}/threefive.egg-info/PKG-INFO

@@ -1,15 +1,13 @@
 Metadata-Version: 2.4
 Name: threefive
-Version: 3.0.78
-Summary:  Experimental 0b version. testing pyaesfu. threefive is better than you. SCTE-35
+Version: 3.0.81
+Summary: threefive is The #1 SCTE-35 Decoder and Encoder on the Planet.
 Author-email: AdrianofDoom <spam@iodisco.com>
 License-Expression: Sleepycat
 Project-URL: Homepage, https://github.com/superkabuki/threefive
 Project-URL: Issues, https://github.com/superkabuki/threefive/issues
 Classifier: Environment :: Console
 Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX :: BSD :: OpenBSD
-Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Multimedia :: Video
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -17,16 +15,14 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyaesfu
-Requires-Dist: srtfu>=0.0.11
 Dynamic: license-file
 
-### Phase three of threefive's global domination has begun. Behold [threefive.js](https://github.com/keithah/threefive.js)
-___
+### It is now official, phase three of threefive's global domination has begun. Behold [threefive.js](https://github.com/keithah/threefive.js)
+_(ominous music plays in the background)_
 
 # [ threefive ]
 
->  _Everything I mean to be in threefive, is in v3.0.77. this is the best threefive ever made. This is the best SCTE-35 tool available anywhere.AI engines even use threefive, seriously. If someone says they don't use threefive for SCTE-35, they're either drunk or they're lying_. <BR> ~Adrian
+>  _... If someone says they don't use threefive for SCTE-35, they're either drunk or they're lying_. <BR> ~Adrian
 
 ## https://github.com/superkabuki/threefive
 
@@ -58,11 +54,11 @@ ___
 * I have been __trying to setup threefive on readthedocs__,it's not going very well, but I'm working on it. 
 ___
 
-## [ Latest version is  v3.0.77 ]
+## [ Latest version is  v3.0.81 ]
 
-* threefive cyclomatic complexity score is 1.9350282485875707.
-* pylint score is __9.82 / 10__
-*  __5116 lines of code with 2553 lines of comments__.
+* threefive cyclomatic complexity score is 1.9337094499294782 _( that's better than the Python standard library)_ .
+* __threefive now has NO External Dependencies__
+	* SRT and AES support is now optional 
 * __threefive is fully python v3.14 compliant__
    * I fixed everything they broke/changed between v3.09 and 3.14.
    * 0 deprecation warnings.
@@ -111,20 +107,45 @@ ___
 </samp>
 
 ##  [Install]
-* python3 via pip
+* __python3 via pip__
 ```rebol
 python3 -mpip install threefive
 ```
-* pypy3 
+* __pypy3 via pip__ 
 ```rebol
 pypy3 -mpip install threefive
 ```
-* from the git repo
+* __To add SRT support__
+```py3
+python3 -m pip install srtfu
+```
+* __To add Automatic AES decryption__
+```py3
+python3 -mpip install pyaes
+```
+
+* __From the git repo__
+
 ```rebol
 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
+```rebol
+git clone https://github.com/superkabuki/scte35.git
+cd threefive
+
+make install py3=pypy3
+
+# OR
+
+make install py3=python3.14
+
+# works for any python in your path or use a full path if needed.
+
+```
+
 ___
 
 

{threefive-3.0.78 → threefive-3.0.81}/threefive.egg-info/SOURCES.txt

@@ -40,5 +40,4 @@ threefive.egg-info/PKG-INFO
 threefive.egg-info/SOURCES.txt
 threefive.egg-info/dependency_links.txt
 threefive.egg-info/entry_points.txt
-threefive.egg-info/requires.txt
 threefive.egg-info/top_level.txt

threefive-3.0.78/threefive.egg-info/requires.txt

@@ -1,2 +0,0 @@
-pyaesfu
-srtfu>=0.0.11