I hate you windows

fuomag9 · Jan 20, 2019 · e709452 · e709452
1 parent 0c52cb0
commit e709452
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/Installer/Installer-SetupFiles/Installer.msi b/Installer/Installer-SetupFiles/Installer.msi
diff --git a/Installer/Installer-cache/cacheIndex.txt b/Installer/Installer-cache/cacheIndex.txt
diff --git a/Installer/Installer-cache/part2/disk1.cab → Installer/Installer-cache/part1/disk1.cab b/Installer/Installer-cache/part2/disk1.cab → Installer/Installer-cache/part1/disk1.cab
diff --git a/...ler/Installer-cache/part2/output-info.ini → ...ler/Installer-cache/part1/output-info.ini b/...ler/Installer-cache/part2/output-info.ini → ...ler/Installer-cache/part1/output-info.ini
diff --git a/Installer/Installer.aip b/Installer/Installer.aip
@@ -22,10 +22,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="fuomag9"/>
-    <ROW Property="ProductCode" Value="1033:{D2B74CDC-555C-4F15-A2A1-A32395AECC77} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{C59B6DAE-89D9-424A-BBFA-BFF5119C51A0} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Video2x"/>
-    <ROW Property="ProductVersion" Value="1.0.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.5" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{5F4E7CB6-CD9E-42A3-A079-DA074FBD62B8}"/>

diff --git a/Video2x/MainWindow.xaml b/Video2x/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Video2x"
         mc:Ignorable="d"
-        Title="Video2x 1.0" Height="450" Width="800">
+        Title="Video2x 1.0.5" Height="450" Width="800">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="455*"/>

diff --git a/Video2x/MainWindow.xaml.cs b/Video2x/MainWindow.xaml.cs
@@ -130,7 +130,7 @@ private async void Button_enhance_Click(object sender, RoutedEventArgs e)
             //just because threads hates me :(
             string input_file = textbox_folder.Text;
 
-           await Task.Run(() => Esegui_console(temp_dir, "ffmpeg -i " + input_file  + " -vsync 0 img-%d.png", debug));
+            await Task.Run(() => Esegui_console(temp_dir, "ffmpeg -i " + input_file  + " -vsync 0 img-%d.png", debug));
 
             progress_bar.Value++;
 
@@ -155,11 +155,14 @@ private async void Button_enhance_Click(object sender, RoutedEventArgs e)
             risoluzione = shellProperty_width.Value.ToString() + "x" + shellProperty_height.Value.ToString();
 
 
+            var lista_files = directoryInfo.GetFiles();
+            Funzioni_utili.DirectoryCopy(System.IO.Path.Combine(System.IO.Path.Combine(application_path, "waifu2x"), "models_rgb"), System.IO.Path.Combine(temp_dir, "models_rgb"));
 
 
-            foreach (FileInfo file in directoryInfo.GetFiles())
+
+            foreach (FileInfo file in lista_files)
             {
-                await Task.Run(() => Esegui_console(System.IO.Path.Combine(application_path, "waifu2x"), "waifu2x-converter-cpp.exe -i " + file.Name + " -o " + file.Name, debug));
+                await Task.Run(() => Esegui_console(temp_dir         ,".'"+System.IO.Path.Combine(System.IO.Path.Combine(application_path, "waifu2x"),@".\waifu2x-converter-cpp.exe")+ "' -i " + file.Name + " -o " + file.Name, debug));
 
 
             }