diff --git a/.gitignore b/.gitignore index 2f9eb9a55..4633a0443 100644 --- a/.gitignore +++ b/.gitignore @@ -296,6 +296,5 @@ __pycache__/ # FilterLists Custom Ignores gs/Private.gs -src/FilterLists.Api/appsettings.Development.json -src/FilterLists.Api/appsettings.Production.json src/FilterLists.DataLoad/appsettings.json +src/FilterLists.Api/appsettings.json \ No newline at end of file diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 70ce71813..8ba03e8f7 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash #TODO: use ssh keys rather than pw chmod a+x /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp1.1/ubuntu.16.04-x64/publish/FilterLists.Api.dll -chmod a+x /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp1.1/ubuntu.16.04-x64/publish/FilterLists.DataLoad sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.Api/bin/Release/netcoreapp1.1/ubuntu.16.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR +chmod a+x /home/travis/build/collinbarrett/FilterLists/src/FilterLists.DataLoad/bin/Release/netcoreapp1.1/ubuntu.16.04-x64/publish/FilterLists.DataLoad sshpass -p $FTP_PASSWORD scp -o StrictHostKeyChecking=no -r /home/travis/build/collinbarrett/FilterLists/src/FilterLists.DataLoad/bin/Release/netcoreapp1.1/ubuntu.16.04-x64/publish/* $FTP_USER@$FTP_HOST:$FTP_DIR \ No newline at end of file diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs index 76b126fa5..e220c77e5 100644 --- a/src/FilterLists.Api/Startup.cs +++ b/src/FilterLists.Api/Startup.cs @@ -1,4 +1,5 @@ -using FilterLists.Api.DependencyInjection.Extensions; +using System.IO; +using FilterLists.Api.DependencyInjection.Extensions; using FilterLists.Data.DependencyInjection.Extensions; using FilterLists.Services.DependencyInjection.Extensions; using JetBrains.Annotations; @@ -12,13 +13,11 @@ namespace FilterLists.Api { public class Startup { - public Startup(IHostingEnvironment env, ILoggerFactory loggerFactory) + public Startup(ILoggerFactory loggerFactory) { var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", false, true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", true) - .AddEnvironmentVariables(); + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", false, true); Configuration = builder.Build(); //TODO: replace with serilog diff --git a/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs b/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs index 8a08735ba..95f39442a 100644 --- a/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs +++ b/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs @@ -6,6 +6,5 @@ namespace FilterLists.Data.Repositories.Contracts public interface IListRepository { IEnumerable GetAll(); - IEnumerable UpdateAll(); } } \ No newline at end of file diff --git a/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs b/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs index 96d9aa175..0f249fd68 100644 --- a/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs +++ b/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs @@ -1,19 +1,16 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using FilterLists.Data.Contexts; using FilterLists.Data.Models; using FilterLists.Data.Repositories.Contracts; -using JetBrains.Annotations; namespace FilterLists.Data.Repositories.Implementations { - [UsedImplicitly] public class ListRepository : IListRepository { private readonly IFilterListsDbContext _filterListsDbContext; - public ListRepository(FilterListsDbContext filterListsDbContext) + public ListRepository(IFilterListsDbContext filterListsDbContext) { _filterListsDbContext = filterListsDbContext; } @@ -22,10 +19,5 @@ public IEnumerable GetAll() { return _filterListsDbContext.List.AsEnumerable(); } - - public IEnumerable UpdateAll() - { - throw new NotImplementedException(); - } } } \ No newline at end of file diff --git a/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj b/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj index f426e7cb7..b1e8b45ff 100644 --- a/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj +++ b/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj @@ -12,7 +12,7 @@ - Never + PreserveNewest diff --git a/src/FilterLists.DataLoad/Startup.cs b/src/FilterLists.DataLoad/Startup.cs index b17dc8ca3..17e8397b7 100644 --- a/src/FilterLists.DataLoad/Startup.cs +++ b/src/FilterLists.DataLoad/Startup.cs @@ -11,7 +11,8 @@ public class Startup { public Startup() { - var builder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()) + var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) .AddJsonFile("appsettings.json", false, true); Configuration = builder.Build(); } diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj index c780c1f37..6be1f0254 100644 --- a/src/FilterLists.Services/FilterLists.Services.csproj +++ b/src/FilterLists.Services/FilterLists.Services.csproj @@ -6,7 +6,6 @@ - diff --git a/src/FilterLists.Services/Implementations/TableService.cs b/src/FilterLists.Services/Implementations/TableService.cs index 36885c915..0ec59704c 100644 --- a/src/FilterLists.Services/Implementations/TableService.cs +++ b/src/FilterLists.Services/Implementations/TableService.cs @@ -1,7 +1,6 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; -using FilterLists.Data.Models; using FilterLists.Data.Repositories.Contracts; using FilterLists.Services.Contracts; @@ -31,26 +30,21 @@ public void UpdateTables() /// name of database table public void UpdateTable(string tableName) { - //TODO: fetch CSV URL from db table - const string csvUrl = "https://raw.githubusercontent.com/collinbarrett/FilterLists/dataToCsv/data/List.csv"; - var file = FetchFile(csvUrl).Result; - var csvRows = file.Split('\n'); - var headerCells = csvRows[0].Split(','); - for (var i = 1; i < csvRows.Length; i++) - if (!string.IsNullOrEmpty(csvRows[i])) - { - var cells = csvRows[i].Split(','); - var list = new List - { - Name = cells[0] - //TODO: finish mappings, try to make generic for any table type using headerCells as properties - }; - } - //TODO: update table via repo/EF + switch (tableName) + { + case "List": + //TODO: fetch CSV URL from db table + const string csvUrl = + "https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/List.csv"; + break; + default: + //TODO: throw invalid table exception + break; + } } /// - /// fetch a file as a string from the internet + /// fetch file as string from internet /// /// URL of file to fetch /// string of file