v2.2.4 - Quiet FFmpeg; add "invert" option to Classic Vis; fix CLI parsing for Image component (#96)

* change noisiness of terminal output
ffmpeg no longer prints everything into the terminal unless we're in `--verbose` mode. percentage progress text stays on one line while not in verbose mode.

* Added hint to run `avp --verbose` if `avp --log` is run with no avp_debug.log file present

* Classic Visualizer: add invert option

* Image component: fix path commandline option

* Image component: restrict file formats in CLI to match GUI

* Color component: add tooltip to color2 picker (second color of gradients)

* change tests to work with pytest-xdist
avp core stores its config (location of `settings.ini`) in temp directories if using multiple workers to run tests, so they don't interfere with each other. when using a single worker, the `tests/data/config` directory is still used

* check alt comp names when parsing cmdline

* rename `original.py` to `classic.py`

* move `component.py` into subpackage

* rename comp_original to comp_classic

* show traceback if renderFrame() raises exception

* do not try to insert non-existent components from project files

* add "composite" property for components
if a component returns "composite" then it will receive a frame to draw on during calls to previewRender and frameRender

* more tests of projects, actions, waveform, spectrum, image, color, classic

* do not change presetDir to "projects" within PresetManager

1 files changed, 53 insertions, 28 deletions

diff --git a/src/avp/components/original.py b/src/avp/components/classic.py
index 0da78dc..72089af 100644
--- a/src/avp/components/original.py
+++ b/src/avp/components/classic.py
@@ -1,21 +1,23 @@
 import numpy
 from PIL import Image, ImageDraw
-from copy import copy
 
-from ..component import Component
-from ..toolkit.frame import BlankFrame
+from ..libcomponent import BaseComponent
+from ..toolkit.frame import BlankFrame, FloodFrame
 from ..toolkit.visualizer import createSpectrumArray
 
 
-class Component(Component):
+class Component(BaseComponent):
     name = "Classic Visualizer"
-    version = "1.1.0"
+    version = "1.2.0"
 
     def names(*args):
-        return ["Original Audio Visualization"]
+        return ["Original"]
 
     def properties(self):
-        return ["pcm"]
+        props = ["pcm"]
+        if self.invert:
+            props.append("composite")
+        return props
 
     def widget(self, *args):
         self.scale = 20
@@ -37,6 +39,7 @@ class Component(Component):
                 "y": self.page.spinBox_y,
                 "smooth": self.page.spinBox_sensitivity,
                 "bars": self.page.spinBox_bars,
+                "invert": self.page.checkBox_invert,
             },
             colorWidgets={
                 "visColor": self.page.pushButton_visColor,
@@ -46,14 +49,19 @@ class Component(Component):
             ],
         )
 
-    def previewRender(self):
+    def previewRender(self, frame=None):
         spectrum = numpy.fromfunction(
             lambda x: float(self.scale) / 2500 * (x - 128) ** 2,
             (255,),
             dtype="int16",
         )
         return self.drawBars(
-            self.width, self.height, spectrum, self.visColor, self.layout
+            self.width,
+            self.height,
+            spectrum,
+            self.visColor,
+            self.layout,
+            frame,
         )
 
     def preFrameRender(self, **kwargs):
@@ -71,7 +79,7 @@ class Component(Component):
             self.progressBarSetText,
         )
 
-    def frameRender(self, frameNo):
+    def frameRender(self, frameNo, frame=None):
         arrayNo = frameNo * self.sampleSize
         return self.drawBars(
             self.width,
@@ -79,9 +87,10 @@ class Component(Component):
             self.spectrumArray[arrayNo],
             self.visColor,
             self.layout,
+            frame,
         )
 
-    def drawBars(self, width, height, spectrum, color, layout):
+    def drawBars(self, width, height, spectrum, color, layout, frame):
         bigYCoord = height - height / 8
         smallYCoord = height / 1200
         bigXCoord = width / (self.bars + 1)
@@ -94,32 +103,44 @@ class Component(Component):
         color2 = (r, g, b, 125)
 
         for i in range(self.bars):
-            x0 = middleXCoord + i * bigXCoord
-            y0 = bigYCoord + smallXCoord
-            y1 = bigYCoord + smallXCoord - spectrum[i * 4] * smallYCoord - middleXCoord
-            x1 = middleXCoord + i * bigXCoord + bigXCoord
-            draw.rectangle(
-                (
+            # draw outline behind rectangles if not inverted
+            if frame is None:
+                x0 = middleXCoord + i * bigXCoord
+                y0 = bigYCoord + smallXCoord
+                x1 = middleXCoord + i * bigXCoord + bigXCoord
+                y1 = (
+                    bigYCoord
+                    + smallXCoord
+                    - spectrum[i * 4] * smallYCoord
+                    - middleXCoord
+                )
+                selection = (
                     x0,
                     y0 if y0 < y1 else y1,
                     x1 if x1 > x0 else x0,
                     y1 if y0 < y1 else y0,
-                ),
-                fill=color2,
-            )
+                )
+                draw.rectangle(
+                    selection,
+                    fill=color2,
+                )
 
             x0 = middleXCoord + smallXCoord + i * bigXCoord
             y0 = bigYCoord
             x1 = middleXCoord + smallXCoord + i * bigXCoord + middleXCoord
             y1 = bigYCoord - spectrum[i * 4] * smallYCoord
+            selection = (
+                x0,
+                y0 if y0 < y1 else y1,
+                x1 if x1 > x0 else x0,
+                y1 if y0 < y1 else y0,
+            )
+            # fill rectangle if not inverted
             draw.rectangle(
-                (
-                    x0,
-                    y0 if y0 < y1 else y1,
-                    x1 if x1 > x0 else x0,
-                    y1 if y0 < y1 else y0,
-                ),
-                fill=color,
+                selection,
+                fill=color if frame is None else (0, 0, 0, 0),
+                outline=color,
+                width=int(x1 - x0),
             )
 
         imBottom = imTop.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
@@ -146,7 +167,11 @@ class Component(Component):
             y = self.y - int(height / 100 * 10)
             im.paste(imBottom, (0, y), mask=imBottom)
 
-        return im
+        if frame is None:
+            return im
+        f = FloodFrame(width, height, color)
+        f.paste(frame, (0, 0), mask=im)
+        return f
 
     def command(self, arg):
         if "=" in arg: