v1.62.5

- 修复bug:分段处理启用时,无法正常读取缓存.
AaronFeng753 · Apr 20, 2020 · e7b0a92 · e7b0a92
1 parent ca6657c
commit e7b0a92
Show file tree

Hide file tree

Showing 14 changed files with 2,433 additions and 375 deletions.
diff --git a/SRC/Waifu2x-Extension-QT/Anime4K.cpp b/SRC/Waifu2x-Extension-QT/Anime4K.cpp
@@ -137,7 +137,7 @@ int MainWindow::Anime4k_Video(int rowNum)
     }
     else
     {
-        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",false);
+        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",false,"","");
     }
     //=======================
     //   检测缓存是否存在
@@ -160,7 +160,7 @@ int MainWindow::Anime4k_Video(int rowNum)
             {
                 if(SourceFile_fullPath!=video_mp4_fullpath)QFile::remove(video_mp4_fullpath);
             }
-            emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",false);
+            emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",false,"","");
             //=======
             emit Send_TextBrowser_NewMessage(tr("The previous video cache file was detected, but because you changed the settings about the video resolution, the previous cache will be deleted and processing of the video:[")+SourceFile_fullPath+tr("] will restart."));
         }
@@ -176,7 +176,7 @@ int MainWindow::Anime4k_Video(int rowNum)
         {
             if(SourceFile_fullPath!=video_mp4_fullpath)QFile::remove(video_mp4_fullpath);
         }
-        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",false);
+        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",false,"","");
         //========
     }
     //==========================================
@@ -508,10 +508,18 @@ int MainWindow::Anime4k_Video_BySegment(int rowNum)
         {
             isVideoConfigChanged=true;
         }
+        //============ 修正文件夹名称 =============
+        QString VideoClipsFolderPath_old = configIniRead->value("/VideoConfiguration/VideoClipsFolderPath").toString();
+        QString VideoClipsFolderName_old = configIniRead->value("/VideoConfiguration/VideoClipsFolderName").toString();
+        if(file_isDirExist(VideoClipsFolderPath_old)==true)
+        {
+            VideoClipsFolderPath = VideoClipsFolderPath_old;
+            VideoClipsFolderName = VideoClipsFolderName_old;
+        }
     }
     else
     {
-        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",true);
+        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",true,VideoClipsFolderPath,VideoClipsFolderName);
     }
     //=======================
     //   检测缓存是否存在
@@ -535,7 +543,7 @@ int MainWindow::Anime4k_Video_BySegment(int rowNum)
             {
                 if(SourceFile_fullPath!=video_mp4_fullpath)QFile::remove(video_mp4_fullpath);
             }
-            emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",true);
+            emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",true,VideoClipsFolderPath,VideoClipsFolderName);
             //=======
             emit Send_TextBrowser_NewMessage(tr("The previous video cache file was detected, but because you changed the settings about the video resolution, the previous cache will be deleted and processing of the video:[")+SourceFile_fullPath+tr("] will restart."));
         }
@@ -552,7 +560,7 @@ int MainWindow::Anime4k_Video_BySegment(int rowNum)
         {
             if(SourceFile_fullPath!=video_mp4_fullpath)QFile::remove(video_mp4_fullpath);
         }
-        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",true);
+        emit Send_video_write_VideoConfiguration(VideoConfiguration_fullPath,ScaleRatio,0,CustRes_isEnabled,CustRes_height,CustRes_width,"anime4k",true,VideoClipsFolderPath,VideoClipsFolderName);
         //========
     }
     /*====================================

diff --git a/SRC/Waifu2x-Extension-QT/Waifu2x-Extension-QT.pro b/SRC/Waifu2x-Extension-QT/Waifu2x-Extension-QT.pro
@@ -60,7 +60,8 @@ FORMS += \
 
 TRANSLATIONS += language_English.ts \
                language_Chinese.ts \
-               language_Japanese.ts
+               language_Japanese.ts \
+               language_TraditionalChinese.ts
 
 TARGET = Waifu2x-Extension-GUI
 

diff --git a/SRC/Waifu2x-Extension-QT/Waifu2x-Extension-QT.pro.user b/SRC/Waifu2x-Extension-QT/Waifu2x-Extension-QT.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.1, 2020-04-10T12:53:12. -->
+<!-- Written by QtCreator 4.10.1, 2020-04-16T21:25:06. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>