From 20e14f97db061eaaa9d297eebdc79ff2a048b85b Mon Sep 17 00:00:00 2001
From: AF-1 <>
Date: Tue, 3 Dec 2024 16:45:50 +0100
Subject: [PATCH] add more log messages
---
AlternativePlayCount/Common.pm | 6 ++----
AlternativePlayCount/Plugin.pm | 10 ++++++++--
AlternativePlayCount/install.xml | 2 +-
AlternativePlayCount/strings.txt | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/AlternativePlayCount/Common.pm b/AlternativePlayCount/Common.pm
index 4b8e5ce..a3a44fd 100644
--- a/AlternativePlayCount/Common.pm
+++ b/AlternativePlayCount/Common.pm
@@ -88,7 +88,7 @@ sub createBackup {
main::DEBUGLOG && $log->is_debug && $log->debug('Found '.$trackcount.($trackcount == 1 ? ' track' : ' tracks').' with values in the APC database');
print $output "\n";
- print $output "\n";
+ print $output "\n";
print $output "\n";
print $output "\n";
for my $APCTrack (@APCTracks) {
@@ -112,15 +112,13 @@ sub createBackup {
print $output "\t\n";
}
print $output "\n";
-
- print $output "\n";
close $output;
my $ended = time() - $started;
main::DEBUGLOG && $log->is_debug && $log->debug('Backup completed after '.$ended.' seconds.');
cleanupBackups();
} else {
- main::DEBUGLOG && $log->is_debug && $log->debug('Info: no tracks in APC database');
+ main::INFOLOG && $log->is_info && $log->info('No tracks with play/skip counts in APC database');
}
$prefs->set('status_creatingbackup', 0);
}
diff --git a/AlternativePlayCount/Plugin.pm b/AlternativePlayCount/Plugin.pm
index c4a8f0d..a879c5e 100644
--- a/AlternativePlayCount/Plugin.pm
+++ b/AlternativePlayCount/Plugin.pm
@@ -56,7 +56,7 @@ my $serverPrefs = preferences('server');
my $prefs = preferences('plugin.alternativeplaycount');
my ($ratingslight_enabled, %restoreitem, $currentKey, $inTrack, $inValue, $backupParser, $backupParserNB, $restorestarted, %itemNames);
-my $opened = 0;
+my ($opened, $restoreCount) = 0;
sub initPlugin {
my $class = shift;
@@ -926,6 +926,7 @@ sub restoreFromBackup {
}
$prefs->set('status_restoringfrombackup', 1);
+ $restoreCount = 0;
$restorestarted = time();
my $restorefile = $prefs->get('restorefile');
@@ -933,6 +934,7 @@ sub restoreFromBackup {
if ($clearallbeforerestore) {
resetAPCDatabase(1);
}
+ main::INFOLOG && $log->is_info && $log->info('Starting restore from backup file');
initRestore();
Slim::Utils::Scheduler::add_task(\&restoreScanFunction);
} else {
@@ -1016,7 +1018,7 @@ sub doneScanning {
close(BACKUPFILE);
my $ended = time() - $restorestarted;
- main::DEBUGLOG && $log->is_debug && $log->debug('Restore completed after '.$ended.' seconds.');
+ main::INFOLOG && $log->is_info && $log->info('Restore completed after '.$ended.' seconds. Restored '.$restoreCount.($restoreCount == 1 ? ' track.' : ' tracks.').' Restore count listed here may be slightly higher (e.g. +1) than the correct number stated in the backup file.');
sleep(1.5); # if task is removed too soon from scheduler => undef val as sub ref error
Slim::Utils::Scheduler::remove_task(\&restoreScanFunction);
$prefs->set('isTSlegacyBackupFile', 0);
@@ -1035,6 +1037,7 @@ sub handleStartElement {
}
if ($element eq 'TrackStat') {
$prefs->set('isTSlegacyBackupFile', 1);
+ main::DEBUGLOG && $log->is_debug && $log->debug('Is TS legacy backup file');
}
}
@@ -1117,6 +1120,7 @@ sub handleEndElement {
my $playCount = (!$curTrack->{'playCount'} ? "null" : $curTrack->{'playCount'});
my $lastPlayed = (!$curTrack->{'lastPlayed'} ? "null" : $curTrack->{'lastPlayed'});
$sqlstatement .= "set playCount = $playCount, lastPlayed = $lastPlayed ";
+ main::DEBUGLOG && $log->is_debug && $log->debug("Setting these values for track: playCount = $playCount, lastPlayed = $lastPlayed\n");
} else {
my $playCount = ($curTrack->{'playcount'} == 0 ? "null" : $curTrack->{'playcount'});
my $lastPlayed = ($curTrack->{'lastplayed'} == 0 ? "null" : $curTrack->{'lastplayed'});
@@ -1124,6 +1128,7 @@ sub handleEndElement {
my $lastSkipped = ($curTrack->{'lastskipped'} == 0 ? "null" : $curTrack->{'lastskipped'});
my $dynPSval = ($curTrack->{'dynpsval'} == 0 ? "null" : $curTrack->{'dynpsval'});
$sqlstatement .= "set playCount = $playCount, lastPlayed = $lastPlayed, skipCount = $skipCount, lastSkipped = $lastSkipped, dynPSval = $dynPSval";
+ main::DEBUGLOG && $log->is_debug && $log->debug("Setting these values for track: playCount = $playCount, lastPlayed = $lastPlayed, skipCount = $skipCount, lastSkipped = $lastSkipped, dynPSval = $dynPSval\n");
}
if ($trackURLmd5) {
@@ -1133,6 +1138,7 @@ sub handleEndElement {
$sqlstatement .= " where musicbrainz_id = \"$trackMBID\"";
}
executeSQLstat($sqlstatement);
+ $restoreCount++;
}
%restoreitem = ();
}
diff --git a/AlternativePlayCount/install.xml b/AlternativePlayCount/install.xml
index c9843cf..9c192db 100644
--- a/AlternativePlayCount/install.xml
+++ b/AlternativePlayCount/install.xml
@@ -3,7 +3,7 @@
af18a10e-3810-ee03-55f4-87cca698a191
PLUGIN_ALTERNATIVEPLAYCOUNT
Plugins::AlternativePlayCount::Plugin
- 1.5.9
+ 1.6.0
PLUGIN_ALTERNATIVEPLAYCOUNT_DESC
AF
Plugins::AlternativePlayCount::Importer
diff --git a/AlternativePlayCount/strings.txt b/AlternativePlayCount/strings.txt
index 5b3720e..9dd180d 100644
--- a/AlternativePlayCount/strings.txt
+++ b/AlternativePlayCount/strings.txt
@@ -332,7 +332,7 @@ PLUGIN_ALTERNATIVEPLAYCOUNT_SETTINGS_RESTORE_NOXMLFILE
FR Merci de sélectionner un ficher XML valide créé avec Nombre de Lectures Alternatif !
PLUGIN_ALTERNATIVEPLAYCOUNT_SETTINGS_RESTORE_INPROGESS
- EN restoring...
+ EN preparing to start restore as a background task...
FR restauration...
PLUGIN_ALTERNATIVEPLAYCOUNT_SETTINGS_RESTORE_CLEARALLBEFORE