prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

various updates

Browse source
This commit is contained in:
Collin M. Barrett 2017-06-25 11:44:43 -05:00
parent 4d3603b683
commit ddaadf2f06
9 changed files with 24 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -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

2
scripts/deploy.sh
View file

@ -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

11
src/FilterLists.Api/Startup.cs
View file

@ -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

1
src/FilterLists.Data/Repositories/Contracts/IListRepository.cs
View file

@ -6,6 +6,5 @@ namespace FilterLists.Data.Repositories.Contracts
public interface IListRepository
{
IEnumerable<List> GetAll();
IEnumerable<List> UpdateAll();
}
}

12
src/FilterLists.Data/Repositories/Implementations/ListRepository.cs
View file

@ -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<List> GetAll()
{
return _filterListsDbContext.List.AsEnumerable();
}
public IEnumerable<List> UpdateAll()
{
throw new NotImplementedException();
}
}
}

2
src/FilterLists.DataLoad/FilterLists.DataLoad.csproj
View file

@ -12,7 +12,7 @@
<ItemGroup>
<Content Include="appsettings.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

3
src/FilterLists.DataLoad/Startup.cs
View file

@ -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();
}

1
src/FilterLists.Services/FilterLists.Services.csproj
View file

@ -6,7 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CsvHelper" Version="2.16.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
</ItemGroup>

30
src/FilterLists.Services/Implementations/TableService.cs
View file

@ -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()
/// <param name="tableName">name of database table</param>
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;
}
}
/// <summary>
/// fetch a file as a string from the internet
/// fetch file as string from internet
/// </summary>
/// <param name="url">URL of file to fetch</param>
/// <returns>string of file</returns>