v4.18 updates

Library.cpp

@@ -258,7 +258,16 @@ void Library::CreateIndices()
 		sqlite3_exec( database, conductorIndex.c_str(), NULL /*callback*/, NULL /*arg*/, NULL /*errMsg*/ );
 		const std::string publisherIndex = "CREATE INDEX IF NOT EXISTS MediaIndex_Publisher ON Media(Publisher);";
 		sqlite3_exec( database, publisherIndex.c_str(), NULL /*callback*/, NULL /*arg*/, NULL /*errMsg*/ );
-	}
+
+		const std::string artistCues = "CREATE INDEX IF NOT EXISTS CuesIndex_Artist ON Cues(Artist);";
+		sqlite3_exec( database, artistCues.c_str(), NULL /*callback*/, NULL /*arg*/, NULL /*errMsg*/ );
+		const std::string composerCues = "CREATE INDEX IF NOT EXISTS CuesIndex_Composer ON Cues(Composer);";
+		sqlite3_exec( database, composerCues.c_str(), NULL /*callback*/, NULL /*arg*/, NULL /*errMsg*/ );
+		const std::string conductorCues = "CREATE INDEX IF NOT EXISTS CuesIndex_Conductor ON Cues(Conductor);";
+		sqlite3_exec( database, conductorCues.c_str(), NULL /*callback*/, NULL /*arg*/, NULL /*errMsg*/ );
+		const std::string publisherCues = "CREATE INDEX IF NOT EXISTS CuesIndex_Publisher ON Cues(Publisher);";
+		sqlite3_exec( database, publisherCues.c_str(), NULL /*callback*/, NULL /*arg*/, NULL /*errMsg*/ );
+  }
 }
 
 bool Library::GetMediaInfo( MediaInfo& mediaInfo, const bool scanMedia, const bool sendNotification, const bool removeMissing )
@@ -295,9 +304,9 @@ bool Library::GetMediaInfo( MediaInfo& mediaInfo, const bool scanMedia, const bo
 				const int result = sqlite3_step( stmt );
 				success = ( SQLITE_ROW == result );
 				if ( success ) {
-          const bool staleData = !ExtractMediaInfo( stmt, info );
+          const bool missingData = !ExtractMediaInfo( stmt, info );
           if ( scanMedia && ( MediaInfo::Source::File == info.GetSource() ) ) {
-            if ( staleData ) {
+            if ( missingData ) {
               if ( GetDecoderInfo( info, true /*getTags*/ ) ) {
                 UpdateMediaLibrary( info );
                 if ( sendNotification ) {

ReadMe.txt

@@ -1,4 +1,4 @@
-VUPlayer 4.17
+VUPlayer 4.18
 Copyright (c) 2023 James Chapman
 ------------------------------------------------------------------------------
 website: http://www.vuplayer.com
@@ -42,12 +42,6 @@ http://xiph.org/flac/
 WavPack is copyright (c) 1998-2023 David Bryant
 http://www.wavpack.com
 
-Monkey's Audio is copyright (c) 2000-2023 Matt Ashland
-https://monkeysaudio.com
-
-Musepack is copyright (c) The Musepack Development Team
-https://www.musepack.net
-
 MusicBrainz is copyright (c) The MetaBrainz Foundation
 https://musicbrainz.org/
 

Settings.cpp

@@ -1860,7 +1860,8 @@ std::wstring Settings::GetOutputFilename( const MediaInfo& mediaInfo, const HINS
 	std::wstring conductor = mediaInfo.GetConductor().empty() ? emptyConductor : mediaInfo.GetConductor();
 	WideStringReplaceInvalidFilenameCharacters( conductor, L"_", true /*replaceFolderDelimiters*/ );
 
-  const std::wstring sourceFilename = mediaInfo.GetFilenameWithCues( false /*fullPath*/, true /*removeExtension*/ );
+  std::wstring sourceFilename = mediaInfo.GetFilenameWithCues( false /*fullPath*/, true /*removeExtension*/ );
+	WideStringReplaceInvalidFilenameCharacters( sourceFilename, L"_", true /*replaceFolderDelimiters*/ );
 
 	std::wstringstream ss;
 	ss << std::setfill( static_cast<wchar_t>( '0' ) ) << std::setw( 2 ) << mediaInfo.GetTrack();
@@ -1945,15 +1946,15 @@ std::wstring Settings::GetOutputFilename( const MediaInfo& mediaInfo, const HINS
 	}
 	WideStringReplaceInvalidFilenameCharacters( outputFilename, L"_", false /*replaceFolderDelimiters*/ );
 	WideStringReplace( outputFilename, L"/", L"\\" );
-	const size_t firstPos = outputFilename.find_first_not_of( L"\\ " );
-	const size_t lastPos = outputFilename.find_last_not_of( L"\\ " );
+	const size_t firstPos = outputFilename.find_first_not_of( L"\\ \t" );
+	const size_t lastPos = outputFilename.find_last_not_of( L"\\ \t" );
 	if ( ( std::wstring::npos != firstPos ) && ( std::wstring::npos != lastPos ) ) {
 		outputFilename = outputFilename.substr( firstPos, 1 + lastPos );
 	} else {
 		outputFilename.clear();
 	}
 	if ( outputFilename.empty() ) {
-		outputFilename = std::to_wstring( mediaInfo.GetTrack() );
+		outputFilename = sourceFilename;
 	}
 	outputFilename = extractFolder + outputFilename;
 

vuplayer.iss

@@ -2,14 +2,17 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "VUPlayer"
-#define MyAppVersion "4.17"
-#define MyAppFullVersion "4.17.0.0"
+#define MyAppVersion "4.18"
+#define MyAppFullVersion "4.18.0.0"
 #define MyAppMainVersion "4"
 #define MyAppDefaultDir "VUPlayer 4"
 #define MyAppPublisher "James Chapman"
 #define MyAppURL "http://www.vuplayer.com/"
 #define MyAppExeName "VUPlayer.exe"
 
+; Define to sign the installer & uninstaller (requires appropriate configuration & certificate)
+#undef EnableSigning
+
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
@@ -30,6 +33,10 @@ OutputBaseFilename=VUPlayerSetup
 Compression=lzma
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64
+
+#ifdef EnableSigning
+SignTool=signtool
+#endif
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"