refacts

README.md

@@ -81,7 +81,7 @@ sudo chmod +x /usr/local/lib/isn/isn.exe
 ## TODO
 
 ````bash
-isn add
 isn set-api-key
+isn add
 isn sources
 ````

src/isn/Constants.cs

@@ -1,4 +1,4 @@
-namespace nuget_cli
+namespace isn
 {
     internal static class Constants
     {

src/isn/IDataProtector.cs

@@ -0,0 +1,34 @@
+using System.Text;
+
+namespace isn
+{
+    internal interface IDataProtector
+    {
+        string Protect(string data);
+        string UnProtect(string data);
+    }
+    class DefaultDataProtector : IDataProtector
+    {
+        public string Protect(string data)
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (char c in data)
+            {
+                sb.Append(c+13); 
+            }
+            return sb.ToString();
+        }
+
+        public string UnProtect(string data)
+        {
+            
+            StringBuilder sb = new StringBuilder();
+            foreach (char c in data)
+            {
+                sb.Append(c-13); 
+            }
+            return sb.ToString();
+        }
+    }
+
+}

src/isn/Program.Commands.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Mono.Options;
 
-namespace nuget_cli
+namespace isn
 {
 
     partial class Program
@@ -34,15 +35,39 @@ namespace nuget_cli
             }
             return pushReports;
         }
+        static OptionSet storeoptions = new OptionSet {
+                { "s|source=", "use source", val => source = source ?? val },
+                { "h|help", "show this message and exit", h => shouldShowPushHelp = h != null },
+            };
 
-        private static object StoreApiKey(IEnumerable<string> str)
+            public class IsnSourceSettings {
+                internal string Source { get; set; }
+                
+                internal string[] Keys { get; set; }
+            }
+                public static IEnumerable<IsnSourceSettings>  Sources{ get; protected set; }
+
+        private static object StoreApiKey(IEnumerable<string> storeArgs)
         {
+            var args = storeoptions.Parse(storeArgs);
+            if (shouldShowPushHelp)
+            {
+                // output the options
+                Console.Error.WriteLine("Push Options:");
+                storeoptions.WriteOptionDescriptions(Console.Out);
+            }
+            else {
+                foreach (string keyv in storeArgs)
+                {
+                    EnsureKeyStored(source,keyv);
+                }
+            }
             throw new NotImplementedException();
         }
 
-        private static string LocalizeThis(string arg)
+        private static void EnsureKeyStored(string source, string keyv)
         {
-            return arg;
+            throw new NotImplementedException();
         }
     }
 }

src/isn/Program.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using Mono.Options;
 using Newtonsoft.Json;
 
-namespace nuget_cli
+namespace isn
 {
     partial class Program
     {
@@ -15,6 +15,8 @@ namespace nuget_cli
         private static string source = null;
         private static int pushKO = 0;
 
+        private readonly isn.IDataProtector _protector;
+
         static Program()
         {
         }

src/isn/PushCommand.cs

@@ -4,7 +4,7 @@ using System.Net;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace nuget_cli
+namespace isn
 {
     internal class PushCommand
     {

src/isn/PushReport.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace nuget_cli
+namespace isn
 {
     public class PushReport
     {

src/isn/UploadFilesToServerUsingWebRequest.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace nuget_cli
+namespace isn
 {
     public class NugetdErrorMessage
     {

src/isnd/Controllers/ApiKeysController.cs

@@ -21,18 +21,18 @@ namespace isn.Controllers
     public class ApiKeysController : Controller
     {
         private readonly ApplicationDbContext dbContext;
-        private readonly NugetSettings nugetSettings;
+        private readonly IsndSettings isndSettings;
         private readonly UserManager<ApplicationUser> _userManager;
 
         private readonly IDataProtector protector;
         public ApiKeysController(ApplicationDbContext dbContext, 
-        IOptions<NugetSettings> nugetSettingsOptions,
+        IOptions<IsndSettings> isndSettingsOptions,
         IDataProtectionProvider provider,
         UserManager<ApplicationUser> userManager)
         {
             this.dbContext = dbContext;
-            this.nugetSettings = nugetSettingsOptions.Value;
+            this.isndSettings = isndSettingsOptions.Value;
-            protector = provider.CreateProtector(nugetSettings.ProtectionTitle);
+            protector = provider.CreateProtector(isndSettings.ProtectionTitle);
             _userManager = userManager;
         }
 
@@ -59,7 +59,7 @@ namespace isn.Controllers
         {
             string userid =  User.FindFirstValue(ClaimTypes.NameIdentifier);
             IQueryable<ApiKey> userKeys = GetUserKeys();
-            if (userKeys.Count() >= nugetSettings.MaxUserKeyCount)
+            if (userKeys.Count() >= isndSettings.MaxUserKeyCount)
             {
                 ModelState.AddModelError(null, "Maximum key count reached");
                 return View();

src/isnd/Controllers/PackagesController.Put.cs

@@ -71,7 +71,7 @@ namespace isn.Controllers
                             pkgid = reader.GetId();
                             version = reader.GetVersion();
 
-                            string pkgidpath = Path.Combine(_nugetSettings.PackagesRootDir,
+                            string pkgidpath = Path.Combine(_isndSettings.PackagesRootDir,
                                 pkgid);
                             pkgpath = Path.Combine(pkgidpath, version.ToFullString());
                             string name = $"{pkgid}-{version}.nupkg";

src/isnd/Controllers/PackagesController.cs

@@ -32,7 +32,7 @@ namespace isn.Controllers
         private readonly ILogger<PackagesController> _logger;
         private readonly IDataProtector _protector;
 
-        private readonly NugetSettings _nugetSettings;
+        private readonly IsndSettings _isndSettings;
         readonly ApplicationDbContext _dbContext;
         private readonly PackageManager _packageManager;
         private readonly IUnleash _unleashĈlient;
@@ -40,13 +40,13 @@ namespace isn.Controllers
         public PackagesController(
             ILoggerFactory loggerFactory,
             IDataProtectionProvider provider,
-            IOptions<NugetSettings> nugetOptions,
+            IOptions<IsndSettings> isndOptions,
             IUnleash unleashĈlient,
             ApplicationDbContext dbContext)
         {
             _logger = loggerFactory.CreateLogger<PackagesController>();
-            _nugetSettings = nugetOptions.Value;
+            _isndSettings = isndOptions.Value;
-            _protector = provider.CreateProtector(_nugetSettings.ProtectionTitle);
+            _protector = provider.CreateProtector(_isndSettings.ProtectionTitle);
             _dbContext = dbContext;
             _packageManager = new PackageManager(dbContext);
             _unleashĈlient = unleashĈlient;
@@ -158,7 +158,7 @@ namespace isn.Controllers
            [FromRoute] string id, [FromRoute] string lower,
             [FromRoute] string idf, [FromRoute] string lowerf)
         {
-            var pkgpath = Path.Combine(_nugetSettings.PackagesRootDir,
+            var pkgpath = Path.Combine(_isndSettings.PackagesRootDir,
             id, lower, $"{id}-{lower}.nupkg"
             );
 
@@ -180,7 +180,7 @@ namespace isn.Controllers
             [FromRoute][SafeName][Required] string idf,
             [FromRoute][SafeName][Required] string lowerf)
         {
-            var pkgpath = Path.Combine(_nugetSettings.PackagesRootDir,
+            var pkgpath = Path.Combine(_isndSettings.PackagesRootDir,
             id, lower, $"{id}.nuspec");
 
             FileInfo pkgfi = new FileInfo(pkgpath);

src/isnd/Entities/NugetSettings.cs

@@ -1,6 +1,6 @@
 namespace isn.Entities
 {
-    public class NugetSettings
+    public class IsndSettings
     {
         public string ProtectionTitle {get; set;}
         public string PackagesRootDir {get; set;}

src/isnd/Migrations/20210424155323_init.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20210424155323_init")]

src/isnd/Migrations/20210424155323_init.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     public partial class init : Migration
     {

src/isnd/Migrations/20210502153508_api-keys.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20210502153508_api-keys")]

src/isnd/Migrations/20210502153508_api-keys.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     public partial class apikeys : Migration
     {

src/isnd/Migrations/20210508012908_ApkiKey.CreationDate.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20210508012908_ApkiKey.CreationDate")]

src/isnd/Migrations/20210508012908_ApkiKey.CreationDate.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     public partial class ApkiKeyCreationDate : Migration
     {

src/isnd/Migrations/20210516060430_packages.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20210516060430_packages")]

src/isnd/Migrations/20210516060430_packages.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     public partial class packages : Migration
     {

src/isnd/Migrations/20210522194803_packageVersionKey.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20210522194803_packageVersionKey")]

src/isnd/Migrations/20210522194803_packageVersionKey.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     public partial class packageVersionKey : Migration
     {

src/isnd/Migrations/20210621214109_version-types.Designer.cs

@@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20210621214109_version-types")]

src/isnd/Migrations/20210621214109_version-types.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     public partial class versiontypes : Migration
     {

src/isnd/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using isn.Data;
 
-namespace nugethost.Migrations
+namespace isndhost.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot

src/isnd/Startup.cs

@@ -74,8 +74,8 @@ namespace isn
             // _unleashĈlient = env.CreateUnleahClient(unleashClientSettings.Value);
             var smtpSettingsconf = Configuration.GetSection("Smtp");
             services.Configure<SmtpSettings>(smtpSettingsconf);
-            var nugetSettingsconf = Configuration.GetSection("Nuget");
+            var isndSettingsconf = Configuration.GetSection("Nuget");
-            services.Configure<NugetSettings>(nugetSettingsconf);
+            services.Configure<IsndSettings>(isndSettingsconf);
             var adminStartupListConf = Configuration.GetSection("AdminList");
             services.Configure<AdminStartupList>(adminStartupListConf);
             var unleashConf = Configuration.GetSection("Unleash");