ptulsconv 2.1.1__tar.gz → 2.2.2__tar.gz

{ptulsconv-2.1.1 → ptulsconv-2.2.2}/PKG-INFO

@@ -1,11 +1,32 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: ptulsconv
-Version: 2.1.1
-Summary: Parse and convert Pro Tools text exports
+Version: 2.2.2
+Summary: Read Pro Tools Text exports and generate PDF ADR Reports, JSON
+License: MIT License
+         
+         Copyright (c) 2022 Jamie Hardt
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy
+         of this software and associated documentation files (the "Software"), to deal
+         in the Software without restriction, including without limitation the rights
+         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         copies of the Software, and to permit persons to whom the Software is
+         furnished to do so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all
+         copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         SOFTWARE.
 Keywords: text-processing,parsers,film,broadcast,editing,editorial
-Author-email: Jamie Hardt <jamiehardt@me.com>
+Author: Jamie Hardt
+Author-email: jamiehardt@me.com
 Requires-Python: >=3.8
-Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Multimedia
 Classifier: Topic :: Multimedia :: Sound/Audio
@@ -16,16 +37,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Topic :: Text Processing :: Filters
-Requires-Dist: parsimonious
-Requires-Dist: tqdm
-Requires-Dist: reportlab
-Requires-Dist: py-ptsl >= 101.1.0
-Requires-Dist: Sphinx ~= 5.3.0 ; extra == "doc"
-Requires-Dist: sphinx-rtd-theme >= 1.1.1 ; extra == "doc"
+Provides-Extra: doc
+Requires-Dist: parsimonious (>=0.10.0,<0.11.0)
+Requires-Dist: py-ptsl (>=101.1.0,<102.0.0)
+Requires-Dist: reportlab (>=4.4.1,<5.0.0)
+Requires-Dist: tqdm (>=4.67.1,<5.0.0)
 Project-URL: Documentation, https://ptulsconv.readthedocs.io/
 Project-URL: Issues, https://github.com/iluvcapra/ptulsconv/issues
 Project-URL: Source, https://github.com/iluvcapra/ptulsconv
-Provides-Extra: doc
+Description-Content-Type: text/markdown
 
 [![Documentation Status](https://readthedocs.org/projects/ptulsconv/badge/?version=latest)](https://ptulsconv.readthedocs.io/en/latest/?badge=latest)
 ![](https://img.shields.io/github/license/iluvcapra/ptulsconv.svg)

ptulsconv-2.2.2/ptulsconv/__init__.py

@@ -0,0 +1,3 @@
+"""
+Parse and convert Pro Tools text exports
+"""

{ptulsconv-2.1.1 → ptulsconv-2.2.2}/ptulsconv/docparser/doc_entity.py

@@ -19,11 +19,17 @@ class SessionDescriptor:
         self.tracks = kwargs['tracks']
         self.markers = kwargs['markers']
 
-    def markers_timed(self) -> Iterator[Tuple['MarkerDescriptor', Fraction]]:
+    def markers_timed(self,
+                      only_ruler_markers: bool = True) -> \
+            Iterator[Tuple['MarkerDescriptor', Fraction]]:
         """
         Iterate each marker in the session with its respective time reference.
         """
         for marker in self.markers:
+
+            if marker.track_marker and only_ruler_markers:
+                continue
+
             marker_time = Fraction(marker.time_reference,
                                    int(self.header.sample_rate))
             # marker_time = self.header.convert_timecode(marker.location)
@@ -182,6 +188,7 @@ class MarkerDescriptor:
     units: str
     name: str
     comments: str
+    track_marker: bool
 
     def __init__(self, **kwargs):
         self.number = kwargs['number']
@@ -190,3 +197,4 @@ class MarkerDescriptor:
         self.units = kwargs['units']
         self.name = kwargs['name']
         self.comments = kwargs['comments']
+        self.track_marker = kwargs['track_marker']

{ptulsconv-2.1.1 → ptulsconv-2.2.2}/ptulsconv/docparser/pt_doc_parser.py

@@ -9,7 +9,8 @@ from .doc_entity import SessionDescriptor, HeaderDescriptor, TrackDescriptor, \
 protools_text_export_grammar = Grammar(
     r"""
     document = header files_section? clips_section? plugin_listing?
-               track_listing? markers_listing?
+               track_listing? markers_block?
+
     header   = "SESSION NAME:" fs string_value rs
                "SAMPLE RATE:" fs float_value rs
                "BIT DEPTH:" fs integer_value "-bit" rs
@@ -74,17 +75,33 @@ protools_text_export_grammar = Grammar(
 
     track_clip_state     = ("Muted" / "Unmuted")
 
-    markers_listing        = markers_listing_header markers_column_header
-                             marker_record*
-    markers_listing_header = "M A R K E R S  L I S T I N G" rs
-    markers_column_header  = "#   " fs "LOCATION     " fs
-                             "TIME REFERENCE    " fs
-                             "UNITS    " fs
-                             "NAME                             " fs
-                             "COMMENTS" rs
+    markers_block        = markers_block_header
+                           (markers_list / markers_list_simple)
+
+    markers_list_simple  = markers_column_header_simple marker_record_simple*
+
+    markers_list         = markers_column_header marker_record*
+
+    markers_block_header = "M A R K E R S  L I S T I N G" rs
+
+    markers_column_header_simple =
+                          "#   	LOCATION     	TIME REFERENCE    	"
+                          "UNITS    	NAME                             	"
+                          "COMMENTS" rs
+
+    markers_column_header =
+                          "#   	LOCATION     	TIME REFERENCE    	"
+                          "UNITS    	NAME                             	"
+                          "TRACK NAME                       	"
+                          "TRACK TYPE   	COMMENTS" rs
+
+    marker_record_simple   = integer_value isp fs string_value fs
+                            integer_value isp fs string_value fs string_value
+                            fs string_value rs
 
     marker_record = integer_value isp fs string_value fs integer_value isp fs
-                    string_value fs string_value fs string_value rs
+                    string_value fs string_value fs string_value fs
+                    string_value fs string_value rs
 
     fs = "\t"
     rs = "\n"
@@ -231,22 +248,37 @@ class DocParserVisitor(NodeVisitor):
         return node.text
 
     @staticmethod
-    def visit_markers_listing(_, visited_children):
+    def visit_markers_block(_, visited_children):
         markers = []
 
-        for marker in visited_children[2]:
+        for marker in visited_children[1][0][1]:
             markers.append(marker)
 
         return markers
 
+    @staticmethod
+    def visit_marker_record_simple(_, visited_children):
+
+        return MarkerDescriptor(number=visited_children[0],
+                                location=visited_children[3],
+                                time_reference=visited_children[5],
+                                units=visited_children[8],
+                                name=visited_children[10],
+                                comments=visited_children[12],
+                                track_marker=False)
+
     @staticmethod
     def visit_marker_record(_, visited_children):
+        track_type = visited_children[15]
+        is_track_marker = (track_type == "Track")
+
         return MarkerDescriptor(number=visited_children[0],
                                 location=visited_children[3],
                                 time_reference=visited_children[5],
                                 units=visited_children[8],
                                 name=visited_children[10],
-                                comments=visited_children[12])
+                                comments=visited_children[16],
+                                track_marker=is_track_marker)
 
     @staticmethod
     def visit_formatted_clip_name(_, visited_children):

{ptulsconv-2.1.1 → ptulsconv-2.2.2}/pyproject.toml

@@ -1,13 +1,5 @@
-[build-system]
-requires = ["flit_core >=3.2,<4"]
-build-backend = "flit_core.buildapi"
-
 [project]
 name = "ptulsconv"
-authors = [
-    {name = "Jamie Hardt", email = "jamiehardt@me.com"},
-]
-readme = "README.md"
 license = { file = "LICENSE" }
 classifiers = [
     'License :: OSI Approved :: MIT License',
@@ -22,32 +14,36 @@ classifiers = [
     "Topic :: Text Processing :: Filters"
 ]
 requires-python = ">=3.8"
-dynamic = ["version", "description"]
 keywords = ["text-processing", "parsers", "film", 
     "broadcast", "editing", "editorial"]
-dependencies = [
-  'parsimonious',
-  'tqdm',
-  'reportlab',
-  'py-ptsl >= 101.1.0'
-  ]
-
-[project.optional-dependencies]
-doc = [
-    "Sphinx ~= 5.3.0",
-    "sphinx-rtd-theme >= 1.1.1"
-]
 
-[tool.flit.module]
+[tool.poetry]
 name = "ptulsconv"
+version = "2.2.2"
+description = "Read Pro Tools Text exports and generate PDF ADR Reports, JSON"
+authors = ["Jamie Hardt <jamiehardt@me.com>"]
+license = "MIT"
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+parsimonious = "^0.10.0"
+tqdm = "^4.67.1"
+reportlab = "^4.4.1"
+py-ptsl = "^101.1.0"
+
+[tool.poetry.extras]
+doc = ['sphinx', 'sphinx_rtd_theme']
 
-[project.scripts]
-ptulsconv = "ptulsconv.__main__:main"
+[tool.poetry.scripts]
+wavinfo = 'ptulsconv.__main__:main'
 
-[project.entry_points.console_scripts]
-ptulsconv = 'ptulsconv.__main__:main'
 
 [project.urls]
 Source = 'https://github.com/iluvcapra/ptulsconv'
 Issues = 'https://github.com/iluvcapra/ptulsconv/issues'
 Documentation = 'https://ptulsconv.readthedocs.io/'
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

ptulsconv-2.1.1/ptulsconv/__init__.py

@@ -1,9 +0,0 @@
-"""
-Parse and convert Pro Tools text exports
-"""
-
-__version__ = '2.1.1'
-__author__ = 'Jamie Hardt'
-__license__ = 'MIT'
-__copyright__ = "%s %s (c) 2023 %s. All rights reserved." \
-        % (__name__, __version__, __author__)