diff --git a/src/abstractions/Class1.cs b/src/abstractions/Class1.cs deleted file mode 100644 index 79b1662..0000000 --- a/src/abstractions/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace abstractions -{ - public class Class1 - { - } -} diff --git a/src/console/CommandTree/CommandTreeExtensions.cs b/src/abstractions/CommandTree/CommandTreeExtensions.cs similarity index 98% rename from src/console/CommandTree/CommandTreeExtensions.cs rename to src/abstractions/CommandTree/CommandTreeExtensions.cs index 66f6082..bb5266f 100644 --- a/src/console/CommandTree/CommandTreeExtensions.cs +++ b/src/abstractions/CommandTree/CommandTreeExtensions.cs @@ -3,7 +3,7 @@ using System.Collections.Immutable; using System.Linq; using System.Text; -namespace Shamir.Console +namespace Shamir.Abstractions { public static class CommandTreeExtensions { diff --git a/src/console/CommandTree/DefaultCommandTree.cs b/src/abstractions/CommandTree/DefaultCommandTree.cs similarity index 98% rename from src/console/CommandTree/DefaultCommandTree.cs rename to src/abstractions/CommandTree/DefaultCommandTree.cs index fd57fdd..584b4bb 100644 --- a/src/console/CommandTree/DefaultCommandTree.cs +++ b/src/abstractions/CommandTree/DefaultCommandTree.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Immutable; -namespace Shamir.Console +namespace Shamir.Abstractions { public sealed class DefaultCommandTree : ICommandTree { diff --git a/src/console/CommandTree/DefaultHelpTextCommand.cs b/src/abstractions/CommandTree/DefaultHelpTextCommand.cs similarity index 96% rename from src/console/CommandTree/DefaultHelpTextCommand.cs rename to src/abstractions/CommandTree/DefaultHelpTextCommand.cs index fc746d9..feeee14 100644 --- a/src/console/CommandTree/DefaultHelpTextCommand.cs +++ b/src/abstractions/CommandTree/DefaultHelpTextCommand.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Immutable; using System.Threading.Tasks; -namespace Shamir.Console +namespace Shamir.Abstractions { public sealed class DefaultHelpTextCommand : ICommand { diff --git a/src/console/CommandTree/ICommand.cs b/src/abstractions/CommandTree/ICommand.cs similarity index 88% rename from src/console/CommandTree/ICommand.cs rename to src/abstractions/CommandTree/ICommand.cs index e2e1356..f4d665b 100644 --- a/src/console/CommandTree/ICommand.cs +++ b/src/abstractions/CommandTree/ICommand.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace Shamir.Console +namespace Shamir.Abstractions { public interface ICommand : IOperationsNode { diff --git a/src/console/CommandTree/ICommandTree.cs b/src/abstractions/CommandTree/ICommandTree.cs similarity index 91% rename from src/console/CommandTree/ICommandTree.cs rename to src/abstractions/CommandTree/ICommandTree.cs index 4d03bfe..a438414 100644 --- a/src/console/CommandTree/ICommandTree.cs +++ b/src/abstractions/CommandTree/ICommandTree.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Immutable; -namespace Shamir.Console +namespace Shamir.Abstractions { public interface ICommandTree : IOperationsNode { diff --git a/src/console/CommandTree/IOperationsNode.cs b/src/abstractions/CommandTree/IOperationsNode.cs similarity index 79% rename from src/console/CommandTree/IOperationsNode.cs rename to src/abstractions/CommandTree/IOperationsNode.cs index 5c826ab..2bf85c3 100644 --- a/src/console/CommandTree/IOperationsNode.cs +++ b/src/abstractions/CommandTree/IOperationsNode.cs @@ -1,4 +1,4 @@ -namespace Shamir.Console +namespace Shamir.Abstractions { public interface IOperationsNode { diff --git a/src/console/Extensions/ImmutableArrayExtensions.cs b/src/abstractions/ImmutableArrayExtensions.cs similarity index 100% rename from src/console/Extensions/ImmutableArrayExtensions.cs rename to src/abstractions/ImmutableArrayExtensions.cs diff --git a/src/console/CommandTree/ParsedArgumentsCommand.cs b/src/abstractions/ParsedArgumentsCommand.cs similarity index 97% rename from src/console/CommandTree/ParsedArgumentsCommand.cs rename to src/abstractions/ParsedArgumentsCommand.cs index 3e4c2df..9a92c4c 100644 --- a/src/console/CommandTree/ParsedArgumentsCommand.cs +++ b/src/abstractions/ParsedArgumentsCommand.cs @@ -5,7 +5,7 @@ using CommandLine; using CommandLine.Text; using Microsoft.Extensions.DependencyInjection; -namespace Shamir.Console +namespace Shamir.Abstractions { public abstract class ParsedArgumentsCommand : ICommand { diff --git a/src/abstractions/abstractions.csproj b/src/abstractions/abstractions.csproj index 0e7cfa8..38bf606 100644 --- a/src/abstractions/abstractions.csproj +++ b/src/abstractions/abstractions.csproj @@ -4,6 +4,12 @@ net5.0 Shamir.Abstractions Shamir.Abstractions + enable + + + + + diff --git a/src/commands/azure/Class1.cs b/src/commands/azure/Class1.cs deleted file mode 100644 index 606b55f..0000000 --- a/src/commands/azure/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace azure -{ - public class Class1 - { - } -} diff --git a/src/console/Commands/Cdn/StorageCopyCommand.cs b/src/commands/azure/StorageCopyCommand.cs similarity index 91% rename from src/console/Commands/Cdn/StorageCopyCommand.cs rename to src/commands/azure/StorageCopyCommand.cs index 4f3ef69..595d15b 100644 --- a/src/console/Commands/Cdn/StorageCopyCommand.cs +++ b/src/commands/azure/StorageCopyCommand.cs @@ -5,10 +5,11 @@ using System.Threading.Tasks; using Azure.Storage.Blobs; using Azure.Storage.Blobs.Models; using CommandLine; +using Shamir.Abstractions; -namespace Shamir.Console +namespace Shamir.Commands.Azure { - public class StorageCopyOptions + public sealed class StorageCopyOptions { [Option("connection-string", Required = false, HelpText = "Azure Storage connection string for the Storage Account backing the CDN.")] public string? ConnectionString { get; set; } @@ -53,7 +54,7 @@ namespace Shamir.Console var client = new BlobContainerClient(connectionString, containerName); await client.CreateIfNotExistsAsync(PublicAccessType.Blob); - using var blobStream = inputIsStdInputStream ? System.Console.OpenStandardInput() : File.OpenRead(options.LocalPath); + using var blobStream = inputIsStdInputStream ? Console.OpenStandardInput() : File.OpenRead(options.LocalPath); var response = await client.UploadBlobAsync(path, blobStream); return 0; diff --git a/src/console/Commands/Cdn/StorageGetUrlCommand.cs b/src/commands/azure/StorageGetUrlCommand.cs similarity index 95% rename from src/console/Commands/Cdn/StorageGetUrlCommand.cs rename to src/commands/azure/StorageGetUrlCommand.cs index 410ca91..d7c86ae 100644 --- a/src/console/Commands/Cdn/StorageGetUrlCommand.cs +++ b/src/commands/azure/StorageGetUrlCommand.cs @@ -7,10 +7,11 @@ using Azure.Storage.Blobs.Models; using Azure.Storage.Sas; using CommandLine; using Microsoft.Azure.Storage; +using Shamir.Abstractions; -namespace Shamir.Console +namespace Shamir.Commands.Azure { - public class StorageGetUrlOptions + public sealed class StorageGetUrlOptions { [Option("connection-string", Required = false, HelpText = "Azure Storage connection string for the Storage Account backing the CDN.")] public string? ConnectionString { get; set; } @@ -66,7 +67,7 @@ namespace Shamir.Console uri.Query = parameters.ToString(); } - System.Console.WriteLine(uri.Uri.AbsoluteUri); + Console.WriteLine(uri.Uri.AbsoluteUri); return 0; } diff --git a/src/console/Commands/Cdn/StorageLsCommand.cs b/src/commands/azure/StorageLsCommand.cs similarity index 81% rename from src/console/Commands/Cdn/StorageLsCommand.cs rename to src/commands/azure/StorageLsCommand.cs index d205d0a..bc3248f 100644 --- a/src/console/Commands/Cdn/StorageLsCommand.cs +++ b/src/commands/azure/StorageLsCommand.cs @@ -2,10 +2,11 @@ using System; using System.Threading.Tasks; using Azure.Storage.Blobs; using CommandLine; +using Shamir.Abstractions; -namespace Shamir.Console +namespace Shamir.Commands.Azure { - public class StorageLsOptions + public sealed class StorageLsOptions { [Option("connection-string", Required = false, HelpText = "Azure Storage connection string for the Storage Account backing the CDN.")] public string? ConnectionString { get; set; } @@ -38,9 +39,9 @@ namespace Shamir.Console await foreach (var blob in containerClient.GetBlobsAsync()) { - System.Console.Write(container.Name); - System.Console.Write('/'); - System.Console.WriteLine(blob.Name); + Console.Write(container.Name); + Console.Write('/'); + Console.WriteLine(blob.Name); } } } @@ -49,7 +50,7 @@ namespace Shamir.Console var client = new BlobServiceClient(connectionString); await foreach (var container in client.GetBlobContainersAsync()) { - System.Console.WriteLine(container.Name); + Console.WriteLine(container.Name); } } } @@ -60,9 +61,9 @@ namespace Shamir.Console await foreach (var blob in client.GetBlobsAsync()) { - System.Console.Write(containerName); - System.Console.Write('/'); - System.Console.WriteLine(blob.Name); + Console.Write(containerName); + Console.Write('/'); + Console.WriteLine(blob.Name); } } else @@ -75,16 +76,16 @@ namespace Shamir.Console var client = new BlobContainerClient(connectionString, containerName); await foreach (var blob in client.GetBlobsByHierarchyAsync(default, default, delimiter: "/", prefix)) { - System.Console.Write(containerName); - System.Console.Write('/'); + Console.Write(containerName); + Console.Write('/'); if (blob.IsPrefix) { - System.Console.WriteLine(blob.Prefix); + Console.WriteLine(blob.Prefix); } else if (blob.IsBlob) { - System.Console.WriteLine(blob.Blob.Name); + Console.WriteLine(blob.Blob.Name); } else { diff --git a/src/commands/azure/azure.csproj b/src/commands/azure/azure.csproj index b55a17e..543d670 100644 --- a/src/commands/azure/azure.csproj +++ b/src/commands/azure/azure.csproj @@ -4,8 +4,14 @@ net5.0 Shamir.Commands.Azure Shamir.Commands.Azure + enable + + + + + diff --git a/src/commands/radio/Class1.cs b/src/commands/radio/Class1.cs deleted file mode 100644 index f894ac3..0000000 --- a/src/commands/radio/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace radio -{ - public class Class1 - { - } -} diff --git a/src/console/Commands/Radio/VKLookupCommand.cs b/src/commands/radio/VKLookupCommand.cs similarity index 97% rename from src/console/Commands/Radio/VKLookupCommand.cs rename to src/commands/radio/VKLookupCommand.cs index 82872ba..27ed417 100644 --- a/src/console/Commands/Radio/VKLookupCommand.cs +++ b/src/commands/radio/VKLookupCommand.cs @@ -5,8 +5,9 @@ using System.Net.Http; using System.Text.Json; using System.Threading.Tasks; using CommandLine; +using Shamir.Abstractions; -namespace Shamir.Console +namespace Shamir.Commands.Radio { public class VKLookupOptions { diff --git a/src/commands/radio/radio.csproj b/src/commands/radio/radio.csproj index 8b187c0..4ff48f7 100644 --- a/src/commands/radio/radio.csproj +++ b/src/commands/radio/radio.csproj @@ -4,6 +4,7 @@ net5.0 Shamir.Commands.Radio Shamir.Commands.Radio + enable diff --git a/src/console/Program.cs b/src/console/Program.cs index 1d06d22..0a26f1b 100644 --- a/src/console/Program.cs +++ b/src/console/Program.cs @@ -2,6 +2,9 @@ using System.Threading.Tasks; using CommandLine; using Microsoft.Extensions.DependencyInjection; +using Shamir.Abstractions; +using Shamir.Commands.Azure; +using Shamir.Commands.Radio; namespace Shamir.Console { diff --git a/src/console/shamir.csproj b/src/console/shamir.csproj index ca1c53f..dbbf8bf 100644 --- a/src/console/shamir.csproj +++ b/src/console/shamir.csproj @@ -9,9 +9,6 @@ - - - diff --git a/tests/console.tests/CommandTreeTests.cs b/tests/console.tests/CommandTreeTests.cs index 68db60a..1e14621 100644 --- a/tests/console.tests/CommandTreeTests.cs +++ b/tests/console.tests/CommandTreeTests.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Immutable; using System.Threading.Tasks; using NUnit.Framework; +using Shamir.Abstractions; // TODO: Restructure test project(s) namespace Shamir.Console.Tests {