fixed paths with spaces

fuomag9 · Jan 21, 2019 · 2dc9fcd · 2dc9fcd
1 parent e709452
commit 2dc9fcd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,8 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+Installer/Installer-cache
+Installer/Installer-SetupFiles
 
 # Visual Studio 2015 cache/options directory
 .vs/

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/part1/disk1.cab b/Installer/Installer-cache/part1/disk1.cab
diff --git a/Installer/Installer-cache/part1/output-info.ini b/Installer/Installer-cache/part1/output-info.ini
diff --git a/Installer/Installer.aip b/Installer/Installer.aip
@@ -9,8 +9,8 @@
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_Microsoft.WindowsAPICodePack.Shell.dll" Value="..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_Microsoft.WindowsAPICodePack.ShellExtensions.dll" Value="..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_Microsoft.WindowsAPICodePack.dll" Value="..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib"/>
-    <ROW Property="AI_PROPPATH_DIR_PERBUILD_Video2x.exe" Value="..\Video2x\bin\Release"/>
-    <ROW Property="AI_PROPPATH_DIR_PERBUILD_Video2x.exe.config" Value="..\Video2x\bin\Release"/>
+    <ROW Property="AI_PROPPATH_DIR_PERBUILD_Video2x.exe" Value="..\Video2x\bin\Debug"/>
+    <ROW Property="AI_PROPPATH_DIR_PERBUILD_Video2x.exe.config" Value="..\Video2x\bin\Debug"/>
     <ROW Property="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.Shell.dll" Value="Microsoft.WindowsAPICodePack.Shell.dll"/>
     <ROW Property="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.ShellExtensions.dll" Value="Microsoft.WindowsAPICodePack.ShellExtensions.dll"/>
     <ROW Property="AI_PROPPATH_FILENAME_PERBUILD_Microsoft.WindowsAPICodePack.dll" Value="Microsoft.WindowsAPICodePack.dll"/>
@@ -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:{C59B6DAE-89D9-424A-BBFA-BFF5119C51A0} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{B0179C6E-FAFE-4776-BBE6-E94071E116CA} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="Video2x"/>
-    <ROW Property="ProductVersion" Value="1.0.5" Type="32"/>
+    <ROW Property="ProductName" Value="Video2x [|ProductVersion]"/>
+    <ROW Property="ProductVersion" Value="1.0.7" 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,13 +5,13 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Video2x"
         mc:Ignorable="d"
-        Title="Video2x 1.0.5" Height="450" Width="800">
+        Title="Video2x 1.0.7" Height="450" Width="800">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="455*"/>
             <ColumnDefinition Width="337*"/>
         </Grid.ColumnDefinitions>
-        <Button x:Name="button_enhance" Content="ENHANCE" HorizontalAlignment="Left" Margin="206,184,0,0" VerticalAlignment="Top" Width="367" Height="181" Click="Button_enhance_Click" Grid.ColumnSpan="2"/>
+        <Button x:Name="button_enhance" Content="ENHANCE" HorizontalAlignment="Left" Margin="206,184,0,0" VerticalAlignment="Top" Width="367" Height="181" Click="Button_enhance_Click" Grid.ColumnSpan="2" FontSize="72"/>
         <Button Content="select video" HorizontalAlignment="Left" Margin="30.176,33,0,0" VerticalAlignment="Top" Width="88" Height="30" Click="Button_Click" Grid.Column="1"/>
         <TextBox x:Name="textbox_folder" HorizontalAlignment="Left" Height="30" Margin="22,33,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="444" IsReadOnly="True" Grid.ColumnSpan="2"/>
         <TextBox x:Name="textbox_save" HorizontalAlignment="Left" Height="30" Margin="22,84,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="444" IsReadOnly="True" Grid.ColumnSpan="2"/>

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++;
 
@@ -172,7 +172,7 @@ private async void Button_enhance_Click(object sender, RoutedEventArgs e)
 
 
 
-            await Task.Run(() => Esegui_console(temp_dir, "ffmpeg -r "+framerate+" -f image2 -s "+risoluzione+" -start_number 1 -i img-%d.png -vframes "+frames_count +" -vcodec libx264 -crf "+ compression_rate+ " -pix_fmt yuv420p "+result_file,       debug));
+            await Task.Run(() => Esegui_console(temp_dir, "ffmpeg -r "+framerate+" -f image2 -s "+risoluzione+" -start_number 1 -i img-%d.png -vframes "+frames_count +" -vcodec libx264 -crf "+ compression_rate+ " -pix_fmt yuv420p '"+result_file+"'",       debug));
 
             progress_bar.Value++;