admin/bodyshop-uploader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missed in previous commits.

Browse Source
This commit is contained in:
Patrick Fic
2021-01-18 11:26:25 -08:00
parent fa70ed65cc
commit 8b63557912
2 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BodyshopUploader/Utils/UpdateHandler.cs
View File

@@ -7,6 +7,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
namespace BodyshopPartner.Utils namespace BodyshopPartner.Utils
{ {
@@ -31,7 +32,7 @@ namespace BodyshopPartner.Utils
} }
updateInfo.ReleasesToApply.ForEach(release => logger.Debug("Release to apply " + release.Version)); updateInfo.ReleasesToApply.ForEach(release => logger.Debug("Release to apply " + release.Version));
return true; return true;
} }
} }
@@ -61,12 +62,16 @@ namespace BodyshopPartner.Utils
var updateInfo = await updateManager.CheckForUpdate(); var updateInfo = await updateManager.CheckForUpdate();
var releases = updateInfo.ReleasesToApply; var releases = updateInfo.ReleasesToApply;
logger.Debug("Applying releases", releases.ToString()); logger.Debug("Applying releases", releases.ToString());
await updateManager.DownloadReleases(releases, _ => { await updateManager.DownloadReleases(releases, _ =>
{
logger.Debug("Download Release Progress " + _.ToString()); logger.Debug("Download Release Progress " + _.ToString());
DownloadProgress = _; }); DownloadProgress = _;
await updateManager.ApplyReleases(updateInfo, _ => { });
await updateManager.ApplyReleases(updateInfo, _ =>
{
logger.Debug("Install Progress " + _.ToString()); logger.Debug("Install Progress " + _.ToString());
InstallProgress = _; }); InstallProgress = _;
});
} }
catch (Exception Ex) catch (Exception Ex)
{ {

35
BodyshopUploader/Views/Main.xaml
View File

@@ -20,8 +20,7 @@
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}" FontFamily="{DynamicResource MaterialDesignFont}"
Loaded="Window_Loaded" Loaded="Window_Loaded"
Closing="Window_Closing" Closing="Window_Closing">
>
<Window.DataContext> <Window.DataContext>
<vm:MainViewModel /> <vm:MainViewModel />
</Window.DataContext> </Window.DataContext>
@@ -133,10 +132,6 @@
<Button Command="{Binding StartFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}" <Button Command="{Binding StartFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
Margin="8" Margin="8"
Content="{x:Static p:Resources.Label_StartAllMonitors}" /> Content="{x:Static p:Resources.Label_StartAllMonitors}" />
<Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
Margin="8"
Content="{x:Static p:Resources.Label_StopAllMonitors}" />
<Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}" <Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
Margin="8" Margin="8"
Content="{x:Static p:Resources.Label_StopAllMonitors}" /> Content="{x:Static p:Resources.Label_StopAllMonitors}" />
@@ -153,9 +148,11 @@
Margin="8" Margin="8"
Content="{Binding AppVersion}" /> Content="{Binding AppVersion}" />
<StackPanel Visibility="{Binding UpdateAvailable, Converter={StaticResource BooleanToVisibilityConverter}}"> <StackPanel Visibility="{Binding UpdateAvailable, Converter={StaticResource BooleanToVisibilityConverter}}">
<Button Content="Update" Command="{Binding InstallUpdatesCommand}" /> <Button Content="Update"
<ProgressBar Margin="8" Value="{Binding UpdateProgress}"/> Command="{Binding InstallUpdatesCommand}" />
<ProgressBar Margin="8"
Value="{Binding UpdateProgress}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Grid> <Grid>
@@ -177,26 +174,6 @@
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Binding="{Binding FilePath}" <DataGridTextColumn Binding="{Binding FilePath}"
Header="{x:Static p:Resources.Label_FilePath}" /> Header="{x:Static p:Resources.Label_FilePath}" />
<!--<DataGridTextColumn Binding="{Binding Source}"
Header="{x:Static p:Resources.Label_SourceSystem}" />
<DataGridTemplateColumn Header="{x:Static p:Resources.Label_SourceSystem}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<ComboBox Margin="8"
SelectedItem="{Binding Source}">
<ComboBox.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
</ItemsPanelTemplate>
</ComboBox.ItemsPanel>
<ComboBoxItem>Mitchell</ComboBoxItem>
<ComboBoxItem>Audatex</ComboBoxItem>
<ComboBoxItem>CCC</ComboBoxItem>
</ComboBox>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>-->
<DataGridTextColumn Binding="{Binding FolderMonitor.EnableRaisingEvents, Converter={StaticResource MonitorStatusConverter}}" <DataGridTextColumn Binding="{Binding FolderMonitor.EnableRaisingEvents, Converter={StaticResource MonitorStatusConverter}}"
Header="{x:Static p:Resources.Label_Status}" /> Header="{x:Static p:Resources.Label_Status}" />