update to Qt 6 and Pillow 12

and yeah, I accidentally ran black on the codebase. I don't want to spend more free time fixing that. All of these changes are simple renames or removals, nothing too major.

Author: tassaron

README.md

@@ -1,89 +1,102 @@
 # Audio Visualizer Python
+
 **We need a good name that is not as generic as "audio-visualizer-python"!**
 
 This is a little GUI tool which creates an audio visualization video from an input audio file. Different components can be added and layered to change the resulting video and add images, videos, gradients, text, etc. Encoding options can be changed with a variety of different output containers.
 
 The program works on **Linux**, **macOS**, and **Windows**. If you encounter problems running it or have other bug reports or features that you wish to see implemented, please fork the project and submit a pull request and/or file an [issue](https://github.com/djfun/audio-visualizer-python/issues) on this project.
 
-
 # Screenshots & Videos
+
 [<img title="AVP running on Windows" alt="Screenshot of program on Windows" src="screenshot.png" width="707">](/screenshot.png?raw=true)
 
 ## A video created by this app
-* **[YouTube: A day in spring](https://www.youtube.com/watch?v=-M3jR1NuJHM)** 🎥
+
+- **[YouTube: A day in spring](https://www.youtube.com/watch?v=-M3jR1NuJHM)** 🎥
 
 ## Video demonstration of the app features
-* [YouTube: Audio Visualizer Python v2.0.0 demonstration](https://www.youtube.com/watch?v=EVt2ckQs1Yg) 🎥
 
+- [YouTube: Audio Visualizer Python v2.0.0 demonstration](https://www.youtube.com/watch?v=EVt2ckQs1Yg) 🎥
 
 # Installation
+
 ## Installation on Ubuntu 24.04
-* Install dependencies: `sudo apt install ffmpeg pipx python3-pyqt5`
-* Download this repo and run `pipx install .` in this directory
-* Run the program with `avp` from terminal
 
+- Install system dependencies: `sudo apt install ffmpeg`
+- Make a virtual environment: `python -m venv env`
+- Activate it: `source env/bin/activate`
+- Install Python dependencies: `pip install pyqt6 pillow numpy`
+- Install this program: `pip install .` in this directory
+- Run the program with `avp` from terminal
 
 ## Installation on Windows
-* Install Python from the Windows Store
-* Add Python to your system PATH (it should ask during the installation process)
-* Download this repo (extract from zip if needed)
-* Download and install [FFmpeg](https://www.ffmpeg.org/download.html). Use the GPL-licensed static builds.
-* Add FFmpeg to the system PATH as well (program will then work anywhere)
-  * Alternatively, copy ffmpeg.exe into the folder that you want to run the program within
-* Open command prompt, `cd` into the repo directory, and run: `pip install .`
-* Now run `avp` or `python -m avp` from a command prompt window to start the app
+
+- Install Python from the Windows Store
+- Add Python to your system PATH (it should ask during the installation process)
+- Download this repo (extract from zip if needed)
+- Download and install [FFmpeg](https://www.ffmpeg.org/download.html). Use the GPL-licensed static builds.
+- Add FFmpeg to the system PATH as well (program will then work anywhere)
+    - Alternatively, copy ffmpeg.exe into the folder that you want to run the program within
+- Open command prompt, `cd` into the repo directory, and run: `pip install pyqt6 pillow numpy .`
+- Now run `avp` or `python -m avp` from a command prompt window to start the app
 
 ## Installation on macOS
-* We need help writing instructions for macOS, but the program should work in theory.
+
+- We need help writing instructions for macOS, but the program should work in theory.
 
 # [Keyboard Shortcuts](https://github.com/djfun/audio-visualizer-python/wiki/Keyboard-Shortcuts)
-| Key Combo                 | Effect                                             |
-| ------------------------- | -------------------------------------------------- |
-| Ctrl+S                    | Save Current Project                               |
-| Ctrl+A                    | Save Project As...                                 |
-| Ctrl+O                    | Open Project                                       |
-| Ctrl+N                    | New Project (prompts to save current project)      |
-| Ctrl+Z                    | Undo                                               |
-| Ctrl+Shift+Z _or_ Ctrl+Y  | Redo                                               |
-| Ctrl+T _or_ Insert        | Add Component                                      |
-| Ctrl+R _or_ Delete        | Remove Component                                   |
-| Ctrl+Space                | Focus Component List                               |
-| Ctrl+Shift+S              | Save Component Preset                              |
-| Ctrl+Shift+C              | Remove Preset from Component                       |
-| Ctrl+Up                   | Move Selected Component Up                         |
-| Ctrl+Down                 | Move Selected Component Down                       |
-| Ctrl+Home                 | Move Selected Component to Top                     |
-| Ctrl+End                  | Move Selected Component to Bottom                  |
-| Ctrl+Shift+U              | Open Undo History                                  |
-| Ctrl+Shift+F              | Show FFmpeg Command                                |
 
+| Key Combo                | Effect                                        |
+| ------------------------ | --------------------------------------------- |
+| Ctrl+S                   | Save Current Project                          |
+| Ctrl+A                   | Save Project As...                            |
+| Ctrl+O                   | Open Project                                  |
+| Ctrl+N                   | New Project (prompts to save current project) |
+| Ctrl+Z                   | Undo                                          |
+| Ctrl+Shift+Z _or_ Ctrl+Y | Redo                                          |
+| Ctrl+T _or_ Insert       | Add Component                                 |
+| Ctrl+R _or_ Delete       | Remove Component                              |
+| Ctrl+Space               | Focus Component List                          |
+| Ctrl+Shift+S             | Save Component Preset                         |
+| Ctrl+Shift+C             | Remove Preset from Component                  |
+| Ctrl+Up                  | Move Selected Component Up                    |
+| Ctrl+Down                | Move Selected Component Down                  |
+| Ctrl+Home                | Move Selected Component to Top                |
+| Ctrl+End                 | Move Selected Component to Bottom             |
+| Ctrl+Shift+U             | Open Undo History                             |
+| Ctrl+Shift+F             | Show FFmpeg Command                           |
 
 # Commandline Mode
+
 Projects can be created with the GUI then loaded from the commandline for easy automation of video production. Some components have commandline options for extra customization, and you can save "presets" with settings to load if the commandline option doesn't exist.
 
 ## Example/test command
-* Create a video with a grey "classic visualizer", background image, and text:
-    * `avp -c 0 image path=src/tests/data/test.jpg -c 1 classic color=180,180,180 -c 2 text "title=Episode 371" -i src/tests/data/test.ogg -o output.mp4`
-* [See more about commandline mode in the wiki!](https://github.com/djfun/audio-visualizer-python/wiki/Commandline-Mode)
 
+- Create a video with a grey "classic visualizer", background image, and text:
+    - `avp -c 0 image path=src/tests/data/test.jpg -c 1 classic color=180,180,180 -c 2 text "title=Episode 371" -i src/tests/data/test.ogg -o output.mp4`
+- [See more about commandline mode in the wiki!](https://github.com/djfun/audio-visualizer-python/wiki/Commandline-Mode)
 
 # Developer Information
+
 ## Known Working Versions of Dependencies
-* Python 3.10
-* FFmpeg 4.4.1
-* PyQt5 (Qt v5.15.3)
-* Pillow 9.1.0
-* NumPy 1.22.3
+
+- Python 3.13
+- FFmpeg 8.0.1
+- PyQt6 v6.10.2 (Qt v6.10.1)
+- Pillow 12.1.0
+- NumPy 2.4.1
 
 ## Getting Faster Export Times
-* [Pillow-SIMD](https://github.com/uploadcare/pillow-simd) may be used as a drop-in replacement for Pillow if you desire faster video export times, but it must be compiled from source. For help installing dependencies to compile Pillow-SIMD, see the [Pillow installation guide](https://pillow.readthedocs.io/en/stable/installation.html). Then add the `-SIMD` suffix into `setup.py` and install as usual.
+
+- [Pillow-SIMD](https://github.com/uploadcare/pillow-simd) may be used as a drop-in replacement for Pillow if you desire faster video export times, but it must be compiled from source. For help installing dependencies to compile Pillow-SIMD, see the [Pillow installation guide](https://pillow.readthedocs.io/en/stable/installation.html).
 
 ## Developing a New Component
-* Information for developing a component is in our wiki: [How a Component Works](https://github.com/djfun/audio-visualizer-python/wiki/How-a-Component-Works)
-* File an issue on GitHub if you need help fitting your visualizer into our component system; we would be happy to collaborate
 
+- Information for developing a component is in our wiki: [How a Component Works](https://github.com/djfun/audio-visualizer-python/wiki/How-a-Component-Works)
+- File an issue on GitHub if you need help fitting your visualizer into our component system; we would be happy to collaborate
 
 # License
+
 Source code of audio-visualizer-python is licensed under the MIT license.
 
 Some dependencies of this application are under the GPL license. When packaged with these dependencies, audio-visualizer-python may also be under the terms of this GPL license.

setup.py

@@ -15,49 +15,53 @@ def getTextFromFile(filename, fallback):
     return output
 
 
-PACKAGE_NAME = 'avp'
-SOURCE_DIRECTORY = 'src'
-SOURCE_PACKAGE_REGEX = re.compile(rf'^{SOURCE_DIRECTORY}')
-PACKAGE_DESCRIPTION = 'Create audio visualization videos from a GUI or commandline'
+PACKAGE_NAME = "avp"
+SOURCE_DIRECTORY = "src"
+SOURCE_PACKAGE_REGEX = re.compile(rf"^{SOURCE_DIRECTORY}")
+PACKAGE_DESCRIPTION = "Create audio visualization videos from a GUI or commandline"
 
 
 avp = import_module(SOURCE_DIRECTORY)
-source_packages = find_packages(include=[SOURCE_DIRECTORY, f'{SOURCE_DIRECTORY}.*'])
-proj_packages = [SOURCE_PACKAGE_REGEX.sub(PACKAGE_NAME, name) for name in source_packages]
+source_packages = find_packages(include=[SOURCE_DIRECTORY, f"{SOURCE_DIRECTORY}.*"])
+proj_packages = [
+    SOURCE_PACKAGE_REGEX.sub(PACKAGE_NAME, name) for name in source_packages
+]
 
 
 setup(
-    name='audio_visualizer_python',
+    name="audio_visualizer_python",
     version=avp.__version__,
-    url='https://github.com/djfun/audio-visualizer-python',
-    license='MIT',
+    url="https://github.com/djfun/audio-visualizer-python",
+    license="MIT",
     description=PACKAGE_DESCRIPTION,
-    author=getTextFromFile('AUTHORS', 'djfun, tassaron'),
-    long_description=getTextFromFile('README.md', PACKAGE_DESCRIPTION),
+    author=getTextFromFile("AUTHORS", "djfun, tassaron"),
+    long_description=getTextFromFile("README.md", PACKAGE_DESCRIPTION),
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3 :: Only',
-        'Intended Audience :: End Users/Desktop',
-        'Topic :: Multimedia :: Video :: Non-Linear Editor',
+        "Development Status :: 4 - Beta",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3 :: Only",
+        "Intended Audience :: End Users/Desktop",
+        "Topic :: Multimedia :: Video :: Non-Linear Editor",
     ],
     keywords=[
-        'visualizer', 'visualization', 'commandline video',
-        'video editor', 'ffmpeg', 'podcast'
+        "visualizer",
+        "visualization",
+        "commandline video",
+        "video editor",
+        "ffmpeg",
+        "podcast",
     ],
     packages=proj_packages,
     package_dir={PACKAGE_NAME: SOURCE_DIRECTORY},
     include_package_data=True,
     install_requires=[
-        'Pillow==9.1.1',
-        'PyQt5',
-        'numpy',
-        'pytest',
-        'pytest-qt',
+        "Pillow",
+        "PyQt6",
+        "numpy",
+        "pytest",
+        "pytest-qt",
     ],
     entry_points={
-        'console_scripts': [
-            f'avp = {PACKAGE_NAME}.__main__:main'
-        ],
-    }
+        "console_scripts": [f"avp = {PACKAGE_NAME}.__main__:main"],
+    },
 )

src/__init__.py

@@ -3,32 +3,35 @@
 import logging
 
 
-__version__ = '2.0.0'
+__version__ = "2.1.0"
 
 
 class Logger(logging.getLoggerClass()):
-    '''
-        Custom Logger class to handle custom VERBOSE log level.
-        Levels used in this program are as follows:
-            VERBOSE     Annoyingly frequent debug messages (e.g, in loops)
-            DEBUG       Ordinary debug information
-            INFO        Expected events that are expensive or irreversible
-            WARNING     A non-fatal error or suspicious behaviour
-            ERROR       Any error that would interrupt the user
-            CRITICAL    Things that really shouldn't happen at all
-    '''
+    """
+    Custom Logger class to handle custom VERBOSE log level.
+    Levels used in this program are as follows:
+        VERBOSE     Annoyingly frequent debug messages (e.g, in loops)
+        DEBUG       Ordinary debug information
+        INFO        Expected events that are expensive or irreversible
+        WARNING     A non-fatal error or suspicious behaviour
+        ERROR       Any error that would interrupt the user
+        CRITICAL    Things that really shouldn't happen at all
+    """
+
     def __init__(self, name, level=logging.NOTSET):
         super().__init__(name, level)
         logging.addLevelName(5, "VERBOSE")
 
     def verbose(self, msg, *args, **kwargs):
         if self.isEnabledFor(5):
             self._log(5, msg, args, **kwargs)
+
+
 logging.setLoggerClass(Logger)
 logging.VERBOSE = 5
 
 
-if getattr(sys, 'frozen', False):
+if getattr(sys, "frozen", False):
     # frozen
     wd = os.path.dirname(sys.executable)
 else:

src/__main__.py

@@ -1,39 +1,47 @@
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtWidgets import QApplication
 import sys
 import logging
 import re
 import string
 
 
-log = logging.getLogger('AVP.Main')
+log = logging.getLogger("AVP.Main")
 
 
 def main() -> int:
     """Returns an exit code (0 for success)"""
     proj = None
-    mode = 'GUI'
+    mode = "GUI"
 
     # Determine whether we're in GUI or commandline mode
     if len(sys.argv) > 2:
-        mode = 'commandline'
+        mode = "commandline"
     elif len(sys.argv) == 2:
-        if sys.argv[1].startswith('-'):
-            mode = 'commandline'
+        if sys.argv[1].startswith("-"):
+            mode = "commandline"
         else:
             # remove unsafe punctuation characters such as \/?*&^%$#
-            if sys.argv[1].endswith('.avp'):
+            if sys.argv[1].endswith(".avp"):
                 # remove file extension
                 sys.argv[1] = sys.argv[1][:-4]
-            sys.argv[1] = re.sub(f'[{re.escape(string.punctuation)}]', '', sys.argv[1])
+            sys.argv[1] = re.sub(f"[{re.escape(string.punctuation)}]", "", sys.argv[1])
             # opening a project file with gui
             proj = sys.argv[1]
 
     # Create Qt Application
     app = QApplication(sys.argv)
     app.setApplicationName("audio-visualizer")
 
+    screen = app.primaryScreen()
+    if screen is None:
+        dpi = None
+        log.error("Could not detect DPI")
+    else:
+        dpi = screen.physicalDotsPerInchX()
+        log.info("Detected screen DPI: %s", dpi)
+
     # Launch program
-    if mode == 'commandline':
+    if mode == "commandline":
         from .command import Command
 
         main = Command()
@@ -42,14 +50,15 @@ def main() -> int:
 
     # Both branches here may occur in one execution:
     # Commandline parsing could change mode back to GUI
-    if mode == 'GUI':
+    if mode == "GUI":
         from .gui.mainwindow import MainWindow
 
-        mainWindow = MainWindow(proj)
+        mainWindow = MainWindow(proj, dpi)
         log.debug("Finished creating MainWindow")
         mainWindow.raise_()
 
-    return app.exec_()
+    return app.exec()
+
 
-if __name__ == '__main__':
-    sys.exit(main())
+if __name__ == "__main__":
+    sys.exit(main())