Fix for missing QtMultimedia module

Some Qts don't have the tech for QtMediaPlayer, and I typo'd myself into raising an exception in this situation

Author: hydrusnetwork

docs/changelog.md

@@ -53,7 +53,7 @@ title: Changelog
 ### nicer PIL memory cleanup
 
 * PIL images are now closed promptly (freeing up memory better and faster) in more locations: the visual tuning suite; jpeg quality estimation; icc profile inspection; embedded metadata inspection; exif inspection; decompression bomb testing; 'show file metadata' window; import metadata gen; icc profile inspection on load; on forced PIL loads that error out on conversion to numpy; on another standard method to load images; variable frame duration fetching, 'get number of times to play animation'; 'animation has valid duration'; serialisable object import; ugoira rendering; ugoira API rendering; ugoira property fetch; ugoira json property fetch; Ugoira thumb gen; PSD rendering; PSD thumb gen; the native PIL animation renderer; on EXIF rotation conversion; some weird dequantization; resolution fetch; when some thumbnail stuff errors out; some animation property fetch; OpenXML thumbnail gen; Paint.NET thumb gen; Krita thumb gen; Krita rendering; openraster thumb gen; openraster rendering
-* I went overkill here and yet there are still some gaps. I got all the file loads though, I think, which is the main stuff here that I thtink was lagging. some of it is also a little ugly. we'll see if this improves some lazy memory cleanup during heavy import. if it helps, I may revisit to clean up
+* I went overkill here and yet there are still some gaps. I got all the file loads though, I think, which is the main stuff here that I think was lagging. some of it is also a little ugly. we'll see if this improves some lazy memory cleanup during heavy import. if it helps, I may revisit to clean up
 
 ### import options overhaul
 

docs/old_changelog.html

@@ -72,7 +72,7 @@ <h2 id="version_665"><a href="#version_665">version 665</a></h2>
                         <li>removed Qt5 QKeySequence conversion</li>
                         <li><h3>nicer PIL memory cleanup</h3></li>
                         <li>PIL images are now closed promptly (freeing up memory better and faster) in more locations: the visual tuning suite; jpeg quality estimation; icc profile inspection; embedded metadata inspection; exif inspection; decompression bomb testing; 'show file metadata' window; import metadata gen; icc profile inspection on load; on forced PIL loads that error out on conversion to numpy; on another standard method to load images; variable frame duration fetching, 'get number of times to play animation'; 'animation has valid duration'; serialisable object import; ugoira rendering; ugoira API rendering; ugoira property fetch; ugoira json property fetch; Ugoira thumb gen; PSD rendering; PSD thumb gen; the native PIL animation renderer; on EXIF rotation conversion; some weird dequantization; resolution fetch; when some thumbnail stuff errors out; some animation property fetch; OpenXML thumbnail gen; Paint.NET thumb gen; Krita thumb gen; Krita rendering; openraster thumb gen; openraster rendering</li>
-                        <li>I went overkill here and yet there are still some gaps. I got all the file loads though, I think, which is the main stuff here that I thtink was lagging. some of it is also a little ugly. we'll see if this improves some lazy memory cleanup during heavy import. if it helps, I may revisit to clean up</li>
+                        <li>I went overkill here and yet there are still some gaps. I got all the file loads though, I think, which is the main stuff here that I think was lagging. some of it is also a little ugly. we'll see if this improves some lazy memory cleanup during heavy import. if it helps, I may revisit to clean up</li>
                         <li><h3>import options overhaul</h3></li>
                         <li>wrote migration code that takes the old file/tag/note import options and produces a new populated `ImportOptionsContainer`</li>
                         <li>updated the prefetch import options to track the 'fetch metadata even...' checkboxes, although they will do nothing until migration</li>

hydrus/client/gui/ClientGUI.py

@@ -8658,7 +8658,7 @@ def ReleaseMPVWidget( self, mpv_widget: ClientGUIMPV.MPVWidget ):
         self._persistent_mpv_widgets.append( mpv_widget )
 
 
-    def _UnloadAndPurgeQtMediaPlayer( self, qt_media_player: ClientGUIQtMediaPlayer.QtMediaPlayer):
+    def _UnloadAndPurgeQtMediaPlayer( self, qt_media_player: ClientGUIQtMediaPlayer.QtMediaPlayer ):
 
         if qt_media_player.IsCompletelyUnloaded():
 

hydrus/client/gui/ClientGUIAboutWindow.py

@@ -24,7 +24,7 @@ def render_availability_line( name: str, is_ok: bool, is_module_not_found: bool,
 
     else:
 
-        HydrusData.ShowText( f'Module {name} failed to import because of the following:' )
+        HydrusData.ShowText( f'Hey, one of your optional modules, "{name}", did not load, and the error is more complicated than "you do not have it". The error was:' )
         HydrusData.ShowText( error_trace )
 
         if name == 'mpv' and 'sio_flush' in error_trace:
@@ -61,6 +61,7 @@ def ShowAboutWindow( win: QW.QWidget ):
     from hydrus.client import ClientTime
     from hydrus.client.gui import ClientGUICharts
     from hydrus.client.gui.canvas import ClientGUIMPV
+    from hydrus.client.gui.canvas import ClientGUIQtMediaPlayer
     from hydrus.client.networking import ClientNetworkingDomainTLDExtract
     from hydrus.client.parsing import ClientParsing
 
@@ -225,6 +226,7 @@ def ShowAboutWindow( win: QW.QWidget ):
     availability_lines.append( render_availability_line( 'lxml', ClientParsing.LXML_IS_OK, not ClientParsing.LXML_IS_OK, '' ) )
     availability_lines.append( render_availability_line( 'lz4', HydrusCompression.LZ4_OK, not HydrusCompression.LZ4_OK, '' ) )
     availability_lines.append( render_availability_line( 'olefile', HydrusOLEHandling.OLEFILE_OK, not HydrusOLEHandling.OLEFILE_OK, '' ) )
+    availability_lines.append( render_availability_line( 'QtMultimedia', ClientGUIQtMediaPlayer.QT_MULTIMEDIA_IS_AVAILABLE, ClientGUIQtMediaPlayer.QT_MULTIMEDIA_MODULE_NOT_FOUND, ClientGUIQtMediaPlayer.QT_MULTIMEDIA_IMPORT_ERROR ) )
     availability_lines.append( render_availability_line( 'tldextract (under testing)', ClientNetworkingDomainTLDExtract.TLDEXTRACT_OK, ClientNetworkingDomainTLDExtract.TLDEXTRACT_MODULE_NOT_FOUND, ClientNetworkingDomainTLDExtract.TLDEXTRACT_IMPORT_ERROR ) )
 
     #

hydrus/client/gui/canvas/ClientGUICanvasMedia.py

@@ -1696,6 +1696,12 @@ def _MakeMediaWindow( self ):
 
             HydrusData.ShowText( 'MPV is not available!' )
 
+        elif self._show_action == CC.MEDIA_VIEWER_ACTION_SHOW_WITH_QTMEDIAPLAYER and not ClientGUIQtMediaPlayer.QT_MULTIMEDIA_IS_AVAILABLE:
+            
+            self._show_action = CC.MEDIA_VIEWER_ACTION_SHOW_OPEN_EXTERNALLY_BUTTON
+            
+            HydrusData.ShowText( 'QtMediaPlayer is not available!' )
+            
 
         if self._show_action in ( CC.MEDIA_VIEWER_ACTION_DO_NOT_SHOW_ON_ACTIVATION_OPEN_EXTERNALLY, CC.MEDIA_VIEWER_ACTION_DO_NOT_SHOW ):
 

hydrus/client/gui/canvas/ClientGUIQtMediaPlayer.py

@@ -1,21 +1,24 @@
+import traceback
 import typing
 
 from qtpy import QtCore as QC
 from qtpy import QtWidgets as QW
 from qtpy import QtGui as QG
 
-QT_MULTIMEDIA_OK = False
+QT_MULTIMEDIA_IS_AVAILABLE = True
+QT_MULTIMEDIA_MODULE_NOT_FOUND = False
+QT_MULTIMEDIA_IMPORT_ERROR = 'QtMultimedia seems fine!'
 
 try:
 
     from qtpy import QtMultimediaWidgets as QMW
     from qtpy import QtMultimedia as QM
 
-    QT_MULTIMEDIA_OK = True
+except Exception as e_qt_m:
 
-except Exception as e:
-    
-    pass
+    QT_MULTIMEDIA_IS_AVAILABLE = False
+    QT_MULTIMEDIA_MODULE_NOT_FOUND = isinstance( e_qt_m, ModuleNotFoundError )
+    QT_MULTIMEDIA_IMPORT_ERROR = traceback.format_exc()
 
 
 from hydrus.core import HydrusConstants as HC
@@ -35,9 +38,9 @@
     from hydrus.client.gui.canvas import ClientGUICanvas
 
 
-def GetAvailableAudioDevices() -> list[ QM.QAudioDevice ]:
+def GetAvailableAudioDevices() -> "list[ QM.QAudioDevice ]":
 
-    if not QT_MULTIMEDIA_OK:
+    if not QT_MULTIMEDIA_IS_AVAILABLE:
 
         return []