@@ -38,6 +38,7 @@ import { checkForPluginUpdates } from './store';
3838import TabsHook from './tabs-hook' ;
3939import Toaster from './toaster' ;
4040import { getVersionInfo } from './updater' ;
41+ import { getPluginDisplayName } from './utils/pluginHelpers' ;
4142import { getSetting , setSetting } from './utils/settings' ;
4243import TranslationHelper , { TranslationClass } from './utils/TranslationHelper' ;
4344
@@ -343,7 +344,7 @@ class PluginLoader extends Logger {
343344
344345 public dismountAll ( ) {
345346 for ( const plugin of this . plugins ) {
346- this . log ( `Dismounting ${ plugin . name } ` ) ;
347+ this . log ( `Dismounting ${ getPluginDisplayName ( plugin . name , plugin . version ) } ` ) ;
347348 plugin . onDismount ?.( ) ;
348349 }
349350 }
@@ -403,14 +404,14 @@ class PluginLoader extends Logger {
403404 timeoutMS ?: number ,
404405 ) {
405406 if ( useQueue && this . reloadLock ) {
406- this . log ( ' Reload currently in progress, adding to queue' , name ) ;
407+ this . log ( ` Reload currently in progress, adding ${ getPluginDisplayName ( name , version ) } to queue` ) ;
407408 this . pluginReloadQueue . push ( { name, version : version , loadType } ) ;
408409 return ;
409410 }
410411
411412 try {
412413 if ( useQueue ) this . reloadLock = true ;
413- this . log ( `Trying to load ${ name } ` ) ;
414+ this . log ( `Trying to load ${ getPluginDisplayName ( name , version ) } ` ) ;
414415
415416 this . unloadPlugin ( name , true ) ;
416417 const startTime = performance . now ( ) ;
@@ -420,7 +421,7 @@ class PluginLoader extends Logger {
420421
421422 this . deckyState . setDisabledPlugins ( this . deckyState . publicState ( ) . disabledPlugins . filter ( ( d ) => d . name !== name ) ) ;
422423 this . deckyState . setPlugins ( this . plugins ) ;
423- this . log ( `Loaded ${ name } in ${ endTime - startTime } ms` ) ;
424+ this . log ( `Loaded ${ getPluginDisplayName ( name , version ) } in ${ endTime - startTime } ms` ) ;
424425 } catch ( e ) {
425426 throw e ;
426427 } finally {
@@ -502,16 +503,17 @@ class PluginLoader extends Logger {
502503 version : version ,
503504 loadType,
504505 } ) ;
505- } else throw new Error ( `${ name } frontend_bundle not OK` ) ;
506+ } else throw new Error ( `${ getPluginDisplayName ( name , version ) } frontend_bundle not OK` ) ;
506507 break ;
507508
508509 default :
509- throw new Error ( `${ name } has no defined loadType.` ) ;
510+ throw new Error ( `${ getPluginDisplayName ( name , version ) } has no defined loadType.` ) ;
510511 }
511512 } catch ( e ) {
512513 if ( e === timeoutException ) throw timeoutException ;
513514
514- this . error ( 'Error loading plugin ' + name , e ) ;
515+ this . error ( `Error loading plugin ${ getPluginDisplayName ( name , version ) } ` , e ) ;
516+
515517 const TheError : FC < { } > = ( ) => (
516518 < PanelSection >
517519 < PanelSectionRow >
@@ -731,7 +733,8 @@ class PluginLoader extends Logger {
731733 backendAPI . useQuickAccessVisible = useQuickAccessVisible ;
732734 }
733735
734- this . debug ( `${ pluginName } connected to loader API.` ) ;
736+ // Note: version info not available at connection time
737+ this . debug ( `Plugin ${ pluginName } connected to loader API.` ) ;
735738 return backendAPI ;
736739 } ,
737740 } ;
0 commit comments