@@ -18,8 +18,7 @@ public sealed partial class RegisterNewDistro_Page : Page
18
18
19
19
private string distroTarballPath ;
20
20
private string distroSource ;
21
- private easyWslLib . Helpers helpers = new ( ) ;
22
- //private DockerDownloader dockerDownloader = new();
21
+ private Helpers helpers = new ( ) ;
23
22
private Windows . Storage . StorageFolder storageDirectory = Windows . Storage . ApplicationData . Current . LocalFolder ;
24
23
25
24
private Dictionary < string , string > distrosSources = new ( )
@@ -78,7 +77,7 @@ internal interface IWindowNative
78
77
}
79
78
private async void registerDistroProceedButton_Click ( object sender , RoutedEventArgs e )
80
79
{
81
- easyWslLib . DockerDownloader dockerDownloader2 = new ( App . tmpDirectory . Path ,
80
+ DockerDownloader dockerDownloader = new ( App . tmpDirectory . Path ,
82
81
new PlatformHelpers ( Path . Combine ( App . executableLocation , "dep" , "bsdtar.exe" ) , HttpProgressCallback ) ) ;
83
82
84
83
@@ -131,8 +130,7 @@ private async void registerDistroProceedButton_Click(object sender, RoutedEventA
131
130
132
131
try
133
132
{
134
- //await dockerDownloader.DownloadImage(image, HttpProgressCallback);
135
- await dockerDownloader2 . DownloadImage ( image ) ;
133
+ await dockerDownloader . DownloadImage ( image ) ;
136
134
}
137
135
catch ( DockerDownloader . DockerException )
138
136
{
@@ -145,8 +143,7 @@ private async void registerDistroProceedButton_Click(object sender, RoutedEventA
145
143
registerDistroProgressBar . Visibility = Visibility . Collapsed ;
146
144
registeringStatusTextBlock . Visibility = Visibility . Collapsed ;
147
145
148
- //await dockerDownloader.CombineLayers();
149
- await dockerDownloader2 . CombineLayers ( ) ;
146
+ await dockerDownloader . CombineLayers ( ) ;
150
147
await RegisterDistro ( distroName , Path . Combine ( App . tmpDirectory . Path , "install.tar.bz" ) ) ;
151
148
break ;
152
149
case "Docker Hub" :
@@ -158,8 +155,7 @@ private async void registerDistroProceedButton_Click(object sender, RoutedEventA
158
155
159
156
try
160
157
{
161
- //await dockerDownloader.DownloadImage(image, HttpProgressCallback);
162
- await dockerDownloader2 . DownloadImage ( image ) ;
158
+ await dockerDownloader . DownloadImage ( image ) ;
163
159
}
164
160
catch ( DockerDownloader . DockerException )
165
161
{
@@ -172,8 +168,7 @@ private async void registerDistroProceedButton_Click(object sender, RoutedEventA
172
168
registerDistroProgressBar . Visibility = Visibility . Collapsed ;
173
169
registeringStatusTextBlock . Visibility = Visibility . Collapsed ;
174
170
175
- //await dockerDownloader.CombineLayers();
176
- await dockerDownloader2 . CombineLayers ( ) ;
171
+ await dockerDownloader . CombineLayers ( ) ;
177
172
await RegisterDistro ( distroName , Path . Combine ( App . tmpDirectory . Path , "install.tar.bz" ) ) ;
178
173
break ;
179
174
case "Local hard drive" :
0 commit comments