From a3a3dba924b0ebbcc7a19522f4e2480f9267ae84 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Wed, 9 Oct 2019 11:39:51 -0700 Subject: [PATCH] Progress with tqdm --- ptulsconv/commands.py | 1 + ptulsconv/ptuls_parser_visitor.py | 5 ++--- ptulsconv/transformations.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ptulsconv/commands.py b/ptulsconv/commands.py index 0f64f0d..5a4e78b 100644 --- a/ptulsconv/commands.py +++ b/ptulsconv/commands.py @@ -4,6 +4,7 @@ import sys from xml.etree.ElementTree import TreeBuilder, tostring import ptulsconv +from tqdm import tqdm def fmp_dump(data, input_file_name, output): doc = TreeBuilder(element_factory=None) diff --git a/ptulsconv/ptuls_parser_visitor.py b/ptulsconv/ptuls_parser_visitor.py index fd9466d..5136497 100644 --- a/ptulsconv/ptuls_parser_visitor.py +++ b/ptulsconv/ptuls_parser_visitor.py @@ -2,9 +2,8 @@ from parsimonious.nodes import NodeVisitor, Node class DictionaryParserVisitor(NodeVisitor): - - @staticmethod - def visit_document(node: Node, visited_children) -> dict: + + def visit_document(self, node: Node, visited_children) -> dict: files = next(iter(visited_children[1]), None) clips = next(iter(visited_children[2]), None) plugins = next(iter(visited_children[3]), None) diff --git a/ptulsconv/transformations.py b/ptulsconv/transformations.py index 3b3d85e..a124023 100644 --- a/ptulsconv/transformations.py +++ b/ptulsconv/transformations.py @@ -4,6 +4,7 @@ from parsimonious.exceptions import IncompleteParseError import math import sys +from tqdm import tqdm class Transformation: def transform(self, input_dict) -> dict: @@ -131,7 +132,8 @@ class TagInterpreter(Transformation): title_tags = self.parse_tags(input_dict['header']['session_name'], "") markers = sorted(input_dict['markers'], key=lambda m: m['location_decoded']['frame_count']) - for track in input_dict['tracks']: + + for track in tqdm(input_dict['tracks'], desc="Reading tracks...", unit='Track'): if 'Muted' in track['state'] and self.ignore_muted: continue