Update UI to show where to download external tools

MakeMKV is now Make H265 MKV
towel42-com · Mar 6, 2023 · 8485470 · 8485470
1 parent 78adfa0
commit 8485470
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 480 deletions.
diff --git a/Core/SearchTMDBInfo.cpp b/Core/SearchTMDBInfo.cpp
@@ -665,7 +665,7 @@ namespace NMediaManager
                 return ( *pos ).second.first;
             }
 
-            auto regExpStr = NPreferences::NCore::CPreferences::instance()->getRippedWithMKVRegEX();
+            auto regExpStr = NPreferences::NCore::CPreferences::instance()->getRippedWithMakeMKVRegEX();
             auto regExp = QRegularExpression( regExpStr );
             auto match = regExp.match( name );
             bool aOK = false;

diff --git a/Models/MakeMKVModel.cpp b/Models/MakeMKVModel.cpp
diff --git a/Models/MakeMKVModel.h b/Models/MakeMKVModel.h
diff --git a/Models/include.cmake b/Models/include.cmake
@@ -29,7 +29,7 @@ set(qtproject_SRCS
     DirNodeItem.cpp
     GenerateBIFModel.cpp
     MergeSRTModel.cpp
-    MakeMKVModel.cpp
+    MakeH265MKVModel.cpp
     TagsModel.cpp
     TransformModel.cpp
     ValidateMKVModel.cpp
@@ -39,7 +39,7 @@ set(qtproject_H
     DirModel.h
     GenerateBIFModel.h
     MergeSRTModel.h
-    MakeMKVModel.h
+    MakeH265MKVModel.h
     TagsModel.h
     TransformModel.h
     ValidateMKVModel.h

diff --git a/Preferences/Core/DefaultPreferences.cpp b/Preferences/Core/DefaultPreferences.cpp
@@ -60,7 +60,7 @@ namespace NMediaManager
                 return !getDefaultCustomPathsToDelete().isEmpty();
             }
 
-            QString CPreferences::getDefaultRippedWithMKVRegEX() const
+            QString CPreferences::getDefaultRippedWithMakeMKVRegEX() const
             {
                 return R"(^.*_t(?<num>\d+)\.mkv$)";
             }

diff --git a/Preferences/Core/Preferences.cpp b/Preferences/Core/Preferences.cpp
@@ -630,19 +630,19 @@ namespace NMediaManager
                 return settings.value( "CustomToDelete", getDefaultCustomPathsToDelete() ).toStringList();
             }
 
-            void CPreferences::setRippedWithMKVRegEX( const QString &value )
+            void CPreferences::setRippedWithMakeMKVRegEX( const QString &value )
             {
                 QSettings settings;
                 settings.beginGroup( toString( EPreferenceType::eTransformPrefs ) );
                 settings.setValue( "RippedWithMKVRegEX", value );
                 emitSigPreferencesChanged( EPreferenceType::eTransformPrefs );
             }
 
-            QString CPreferences::getRippedWithMKVRegEX() const
+            QString CPreferences::getRippedWithMakeMKVRegEX() const
             {
                 QSettings settings;
                 settings.beginGroup( toString( EPreferenceType::eTransformPrefs ) );
-                auto retVal = settings.value( "RippedWithMKVRegEX", getDefaultRippedWithMKVRegEX() ).toString();
+                auto retVal = settings.value( "RippedWithMKVRegEX", getDefaultRippedWithMakeMKVRegEX() ).toString();
 #ifdef _DEBUG
                 Q_ASSERT_X( retVal.indexOf( "?<num>" ) >= 0, "getRippedWithMKVRegEX", "Invalid setting must contain the capture of num" );
 #endif
@@ -1871,7 +1871,7 @@ namespace NMediaManager
                                   << compareValues( "TV Out Dir Pattern", getDefaultOutDirPattern( true ), getTVOutDirPattern( false ) ) << compareValues( "TV Out File Pattern", getDefaultOutFilePattern( true ), getTVOutFilePattern() )
                                   << compareValues( "Skipped Paths (Media Transform)", getDefaultSkippedPaths( true ), getSkippedPaths( true ) )
                                   << compareValues( "Skipped Paths (Media Tagging)", getDefaultSkippedPaths( false ), getSkippedPaths( false ) ) << compareValues( "Ignored Paths", getDefaultIgnoredPaths(), getIgnoredPaths() )
-                                  << compareValues( "Paths to Delete", getDefaultCustomPathsToDelete(), getCustomPathsToDelete() ) << compareValues( "Ripped With MKV RegEX", getDefaultRippedWithMKVRegEX(), getRippedWithMKVRegEX() )
+                                  << compareValues( "Paths to Delete", getDefaultCustomPathsToDelete(), getCustomPathsToDelete() ) << compareValues( "Ripped With MKV RegEX", getDefaultRippedWithMakeMKVRegEX(), getRippedWithMakeMKVRegEX() )
 
                                   << compareValues( "Delete Custom", getDefaultDeleteCustom(), deleteCustom() ) << compareValues( "Delete Executables", getDefaultDeleteEXE(), deleteEXE() )
                                   << compareValues( "Delete NFO Files", getDefaultDeleteNFO(), deleteNFO() ) << compareValues( "Delete BAK Files", getDefaultDeleteBAK(), deleteBAK() )
@@ -1918,7 +1918,7 @@ namespace NMediaManager
                     replaceText( "%DEFAULT_OUT_FILE_PATTERN%", newFileText, "getDefaultOutFilePattern", "forTV", getTVOutFilePattern(), getMovieOutFilePattern() );
                     replaceText( "%DEFAULT_CUSTOM_PATHS_TO_DELETE%", newFileText, "getDefaultCustomPathsToDelete", getCustomPathsToDelete() );
                     replaceText( "%DEFAULT_DELETE_CUSTOM%", newFileText, "getDefaultDeleteCustom", "!getDefaultCustomPathsToDelete().isEmpty()" );
-                    replaceText( "%DEFAULT_RIPPED_WITH_MKV_REGEX%", newFileText, "getDefaultRippedWithMKVRegEX", getRippedWithMKVRegEX() );
+                    replaceText( "%DEFAULT_RIPPED_WITH_MKV_REGEX%", newFileText, "getDefaultRippedWithMKVRegEX", getRippedWithMakeMKVRegEX() );
                     replaceText( "%DEFAULT_DELETE_EXE%", newFileText, "getDefaultDeleteEXE", deleteEXE() );
                     replaceText( "%DEFAULT_DELETE_NFO%", newFileText, "getDefaultDeleteNFO", deleteNFO() );
                     replaceText( "%DEFAULT_DELETE_BAK%", newFileText, "getDefaultDeleteBAK", deleteBAK() );

diff --git a/Preferences/Core/Preferences.h b/Preferences/Core/Preferences.h
@@ -164,9 +164,9 @@ namespace NMediaManager
                 QStringList getCustomPathsToDelete() const;
                 void setCustomPathsToDelete( const QStringList &paths );
 
-                QString getDefaultRippedWithMKVRegEX() const;
-                QString getRippedWithMKVRegEX() const;
-                void setRippedWithMKVRegEX( const QString &value );
+                QString getDefaultRippedWithMakeMKVRegEX() const;
+                QString getRippedWithMakeMKVRegEX() const;
+                void setRippedWithMakeMKVRegEX( const QString &value );
 
                 bool getDefaultDeleteCustom() const;
                 bool deleteCustom() const;