Console version finished

Author: SuperJMN

Source/Deployer.Raspberry.Console/ConsoleDisplayUpdater.cs

@@ -18,6 +18,7 @@ private void DisplayProgress(double progress)
         {
             if (double.IsNaN(progress))
             {
+                System.Console.WriteLine();
                 return;
             }
 
@@ -37,7 +38,7 @@ private void DisplayProgress(double progress)
 
         public void Dispose()
         {
-            progressUpdater?.Dispose();
+            progressUpdater?.Dispose();            
         }
     }
 }

Source/Deployer.Raspberry.Console/Deployer.Raspberry.Console.csproj

@@ -68,10 +68,6 @@
       <Link>Core\gpt.zip</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\deployer.raspberry\core\license.md">
-      <Link>Core\license.md</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\deployer.raspberry\core\tools\etcher-cli\x64\node_modules\drivelist\build\release\drivelist.node">
       <Link>Core\Tools\Etcher-Cli\x64\node_modules\drivelist\build\Release\drivelist.node</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -166,6 +162,7 @@
   <ItemGroup>
     <None Include="..\deployer.raspberry\core\tools\etcher-cli\x64\etcher.exe">
       <Link>Core\Tools\Etcher-Cli\x64\etcher.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -189,6 +186,7 @@
   <ItemGroup>
     <None Include="..\deployer.raspberry\core\tools\etcher-cli\x86\etcher.exe">
       <Link>Core\Tools\Etcher-Cli\x86\etcher.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>

Source/Deployer.Raspberry.Console/Options/NonWindowsDeploymentCmdOptions.cs

@@ -5,6 +5,9 @@ namespace Deployment.Console.Options
     [Verb("execute", HelpText = "Executes a script that doesn't deploy Windows")]
     public class NonWindowsDeploymentCmdOptions
     {
+        [Option("disk", Required = true, HelpText = "The disk number of the SD Card to deploy to")]
+        public int DiskNumber { get; set; }
+
         [Option("script", Required = true, HelpText = "Script to execute")]
         public string Script { get; set; }
     }

Source/Deployer.Raspberry.Console/Options/WindowsDeploymentCmdOptions.cs

@@ -5,15 +5,15 @@ namespace Deployment.Console.Options
     [Verb("deploy", HelpText = "Executes a Windows deployment script")]
     public class WindowsDeploymentCmdOptions
     {
+        [Option("disk", Required = true, HelpText = "The disk number of the SD Card to deploy to")]
+        public int DiskNumber { get; set; }
+
         [Option("wim", Required = true, HelpText = "Windows Image (.wim) to deploy")]
         public string WimImage { get; set; }
 
         [Option("index", Default = 1, HelpText = "Index of the image to deploy")]
         public int Index { get; set; }
 
-        [Option("windows-size", Default = 18, HelpText = "Size reserved for Windows partitions in GB")]
-        public double ReservedSizeForWindowsInGb { get; set; }
-
         [Option("compact", Default = false, HelpText = "Enable Compact deployment. Slower, but saves phone disk space")]
         public bool UseCompact { get; set; }
     }

Source/Deployer.Raspberry.Console/Program.cs

@@ -6,6 +6,7 @@
 using ByteSizeLib;
 using CommandLine;
 using Deployer;
+using Deployer.FileSystem;
 using Deployer.Lumia.NetFx;
 using Deployer.Raspberry;
 using Deployer.Tasks;
@@ -44,8 +45,6 @@ private static async Task Execute(IEnumerable<string> args, Subject<double> subj
         {
             var optionsProvider = new WindowsDeploymentOptionsProvider();
 
-            var deployer = GetDeployer(optionsProvider, subject);
-
             var parserResult = Parser.Default
                 .ParseArguments<WindowsDeploymentCmdOptions,
                         NonWindowsDeploymentCmdOptions>(args);
@@ -54,26 +53,31 @@ await parserResult
                 .MapResult(
                     (WindowsDeploymentCmdOptions opts) =>
                     {
+                        var deployer = GetDeployer(optionsProvider, opts.DiskNumber, subject);
                         optionsProvider.Options = new WindowsDeploymentOptions
                         {
                             ImageIndex = opts.Index,
                             ImagePath = opts.WimImage,
-                            SizeReservedForWindows = ByteSize.FromGigaBytes(opts.ReservedSizeForWindowsInGb),
                             UseCompact = opts.UseCompact,
                         };
                         return deployer.Deploy();
                     },
-                    (NonWindowsDeploymentCmdOptions opts) => deployer.Deploy(),
+                    (NonWindowsDeploymentCmdOptions opts) =>
+                    {
+                        var deployer = GetDeployer(optionsProvider, opts.DiskNumber, subject);
+                        return deployer.Deploy();
+                    },
                     HandleErrors);
         }
 
-        private static IWoaDeployer GetDeployer(WindowsDeploymentOptionsProvider op, Subject<double> progress)
+        private static IWoaDeployer GetDeployer(WindowsDeploymentOptionsProvider op, int diskNumber, Subject<double> progress)
         {
             var container = new DependencyInjectionContainer();
 
             container.Configure(x =>
             {
                 x.Configure(op);
+                x.ExportFactory((ILowLevelApi lla) => new DeviceProvider() { Device = new RaspberryPi(lla, diskNumber)}).As<IDeviceProvider>().Lifestyle.Singleton();
                 x.Export<ConsoleMarkdownDisplayer>().As<IMarkdownDisplayer>();
                 x.ExportInstance(progress).As<IObserver<double>>();
             });

Source/Deployer.Raspberry.Gui/Deployer.Raspberry.Gui.csproj

@@ -169,10 +169,6 @@
       <Link>Core\gpt.zip</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\Deployer.Raspberry\Core\license.md">
-      <Link>Core\license.md</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\Deployer.Raspberry\Core\Tools\Etcher-Cli\x64\node_modules\drivelist\build\Release\drivelist.node">
       <Link>Core\Tools\Etcher-Cli\x64\node_modules\drivelist\build\Release\drivelist.node</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Source/Deployer.Raspberry.Gui/Locator.cs

@@ -38,6 +38,7 @@ public Locator()
             container.Configure(x =>
             {
                 x.Configure(optionsProvider);
+                x.Export<DeviceProvider>().As<IDeviceProvider>().Lifestyle.Singleton();
                 x.Export<WpfMarkdownDisplayer>().As<IMarkdownDisplayer>();
                 x.ExportFactory(() => new BehaviorSubject<double>(double.NaN))
                     .As<IObserver<double>>()

Source/Deployer.Raspberry.NetFx/ContainerConfigurator.cs

@@ -45,7 +45,6 @@ where type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IDeploymentTask))
             block.Export<BcdInvokerFactory>().As<IBcdInvokerFactory>();
             block.Export<WindowsDeployer>().As<IWindowsDeployer>();
             block.Export<GitHubDownloader>().As<IGitHubDownloader>();
-            block.Export<DeviceProvider>().As<IDeviceProvider>().Lifestyle.Singleton();
             block.Export<RaspberryDisklayoutPreparer>().As<IDisklayoutPreparer>();
             block.Export<ImageFlasher>().As<IImageFlasher>();
             block.Export<DismImageService>().As<IWindowsImageService>();

Source/Deployer.Raspberry/Core/license.md

@@ -1,4 +1,4 @@
-using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Deployer.FileSystem;
 using Serilog;
@@ -7,16 +7,28 @@ namespace Deployer.Raspberry
 {
     public class RaspberryPi : Device
     {
+        private readonly int diskNumber;
         private readonly Disk disk;
 
+        public RaspberryPi(ILowLevelApi lowLevelApi, int diskNumber) : base(lowLevelApi)
+        {
+            this.diskNumber = diskNumber;
+        }
+
         public RaspberryPi(ILowLevelApi lowLevelApi, Disk disk) : base(lowLevelApi)
         {
             this.disk = disk;
         }
 
-        public override Task<Disk> GetDeviceDisk()
+        public override async Task<Disk> GetDeviceDisk()
         {
-            return Task.FromResult(disk);
+            if (disk == null)
+            {
+                var disks = await LowLevelApi.GetDisks();
+                return disks.First(x => x.Number == diskNumber);
+            }
+
+            return disk;
         }      
 
         public override async Task<Volume> GetBootVolume()