Skip to content

Commit cb77691

Browse files
a-legotina-legotin
committed
changed naming to correct one
1 parent 786c5ee commit cb77691

File tree

8 files changed

+79
-32
lines changed

8 files changed

+79
-32
lines changed

‎src/InstaCrafter.Core/CrafterJobs/CraftJobRepository.cs renamed to ‎src/InstaCrafter.Core/CrafterJobs/CraftJobFactory.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22

33
namespace InstaCrafter.Core.CrafterJobs
44
{
5-
public class CraftJobRepository
5+
public class CraftJobFactory
66
{
7-
private static CraftJobRepository _instance;
7+
private static CraftJobFactory _instance;
88
private static readonly object JobLock = new object();
99

10-
private CraftJobRepository()
10+
private CraftJobFactory()
1111
{
1212
Jobs = new List<ICraftJob>();
1313
}
1414

1515
public List<ICraftJob> Jobs { get; }
1616

17-
public static CraftJobRepository Instance
17+
public static CraftJobFactory Instance
1818
{
1919
get
2020
{
2121
lock (JobLock)
2222
{
23-
return _instance ?? (_instance = new CraftJobRepository());
23+
return _instance ?? (_instance = new CraftJobFactory());
2424
}
2525
}
2626
}

‎src/InstaCrafter.Core/Crafters/CrafterRepository.cs renamed to ‎src/InstaCrafter.Core/Crafters/CrafterFactory.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@
66

77
namespace InstaCrafter.Core.Crafters
88
{
9-
public class CrafterRepository
9+
public class CrafterFactory
1010
{
11-
private static CrafterRepository _instance;
11+
private static CrafterFactory _instance;
1212
private static readonly object CrafterLock = new object();
1313

14-
private CrafterRepository()
14+
private CrafterFactory()
1515
{
1616
Crafters = new List<ICrafter>();
1717
}
1818

1919
public List<ICrafter> Crafters { get; }
2020

21-
public static CrafterRepository Instance
21+
public static CrafterFactory Instance
2222
{
2323
get
2424
{
2525
lock (CrafterLock)
2626
{
27-
return _instance ?? (_instance = new CrafterRepository());
27+
return _instance ?? (_instance = new CrafterFactory());
2828
}
2929
}
3030
}
3131

3232
public ICrafter GetUserMediaCrafter(CraftMediaJob job, ICraftLogger craftLogger)
3333
{
34-
var logger = new LoggersRepository().GetWebLogger();
34+
var logger = new LoggersFactory().GetWebLogger();
3535
var progressReporter = GlobalHost.ConnectionManager.GetHubContext<CraftJobProgressHub>();
3636
var crafter = new UserMediaCrafter(logger, job, Crafters.Count + 1, progressReporter);
3737
Crafters.Add(crafter);

‎src/InstaCrafter.Core/Crafters/UserMediaCrafter.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public UserMediaCrafter(ICraftLogger logger, ICraftJob job, int id, IHubContext
2525

2626
public void Craft()
2727
{
28-
Logger.WriteLog(LogMessageType.Info, $"#{Id}: new job found! Id: {Job}");
28+
Logger.WriteLog(LogMessageType.Info, $"#{Id}: new job found! Id: {Job.Id}");
2929
var craftUserMediaJob = Job as CraftMediaJob;
3030
if (craftUserMediaJob == null)
3131
{
@@ -48,7 +48,7 @@ public void Craft()
4848
using (var client = new HttpClient())
4949
{
5050
client.BaseAddress = new Uri("http://localhost:5000/");
51-
51+
client.Timeout = TimeSpan.FromSeconds(30);
5252
client.DefaultRequestHeaders.Accept.Clear();
5353
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
5454
foreach (var media in userMedia)
@@ -61,7 +61,11 @@ public void Craft()
6161

6262
var response = client.GetAsync($"api/post/{media.Code}");
6363
if (response.Result.StatusCode != HttpStatusCode.OK)
64+
{
6465
Logger.WriteLog(LogMessageType.Error, $"{Name} #{Id}: unable to check post : {media.Code}, skipping");
66+
continue;
67+
68+
}
6569

6670
var postJson = response.Result.Content.ReadAsStringAsync().Result;
6771
var post = JsonConvert.DeserializeObject<InstaPost>(postJson);

‎src/InstaCrafter.Core/Hubs/CraftJobHub.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public class CraftJobHub : Hub
1010
{
1111
public void SendCraftMediaJob(string username)
1212
{
13-
var job = CraftJobRepository.Instance.GetNewMediaJob(username);
14-
var logger = new LoggersRepository().GetWebLogger();
15-
var crafter = CrafterRepository.Instance.GetUserMediaCrafter(job, logger);
13+
var job = CraftJobFactory.Instance.GetNewMediaJob(username);
14+
var logger = new LoggersFactory().GetWebLogger();
15+
var crafter = CrafterFactory.Instance.GetUserMediaCrafter(job, logger);
1616
Task.Run(() => { crafter.Craft(); });
1717
}
1818
}

‎src/InstaCrafter.Core/InstaCrafter.Core.csproj

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@
4848
<Reference Include="InstaCrafter.Classes">
4949
<HintPath>..\InstaCrafter.Classes\bin\Debug\net452\InstaCrafter.Classes.dll</HintPath>
5050
</Reference>
51-
<Reference Include="InstagramAPI-Web">
52-
<HintPath>..\..\..\..\Users\legot\.nuget\packages\InstagramAPI-Web\1.2.1\lib\net452\InstagramAPI-Web.dll</HintPath>
51+
<Reference Include="InstagramAPI-Web, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\InstagramAPI-Web.1.2.1\lib\net452\InstagramAPI-Web.dll</HintPath>
53+
<Private>True</Private>
5354
</Reference>
5455
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5556
<HintPath>..\..\packages\Microsoft.AspNet.SignalR.Core.2.2.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
@@ -72,21 +73,33 @@
7273
<HintPath>..\..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
7374
<Private>True</Private>
7475
</Reference>
76+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
78+
<Private>True</Private>
79+
</Reference>
7580
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7681
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7782
<Private>True</Private>
7883
</Reference>
79-
<Reference Include="Owin">
80-
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
84+
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
85+
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
86+
<Private>True</Private>
8187
</Reference>
8288
<Reference Include="System" />
89+
<Reference Include="System.ComponentModel.Composition" />
8390
<Reference Include="System.Data" />
8491
<Reference Include="System.Data.DataSetExtensions" />
8592
<Reference Include="System.Data.Entity" />
8693
<Reference Include="System.Drawing" />
94+
<Reference Include="System.IO.Compression" />
8795
<Reference Include="System.Net.Http.Formatting">
8896
<HintPath>..\..\..\..\Users\legot\.nuget\packages\Microsoft.AspNet.WebApi.Client\5.2.3\lib\portable-wp8+netcore45+net45+wp81+wpa81\System.Net.Http.Formatting.dll</HintPath>
8997
</Reference>
98+
<Reference Include="System.Numerics" />
99+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100+
<HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
101+
<Private>True</Private>
102+
</Reference>
90103
<Reference Include="System.Web.DynamicData" />
91104
<Reference Include="System.Web.Entity" />
92105
<Reference Include="System.Web.ApplicationServices" />
@@ -127,10 +140,6 @@
127140
<Reference Include="System.Configuration" />
128141
<Reference Include="System.Web.Services" />
129142
<Reference Include="System.EnterpriseServices" />
130-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131-
<Private>True</Private>
132-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
133-
</Reference>
134143
<Reference Include="System.Net.Http">
135144
</Reference>
136145
<Reference Include="System.Net.Http.WebRequest">
@@ -149,12 +158,12 @@
149158
<Compile Include="Controllers\PostsController.cs" />
150159
<Compile Include="CrafterJobs\CraftJobKind.cs" />
151160
<Compile Include="CrafterJobs\CraftJobProgress.cs" />
152-
<Compile Include="CrafterJobs\CraftJobRepository.cs" />
161+
<Compile Include="CrafterJobs\CraftJobFactory.cs" />
153162
<Compile Include="CrafterJobs\CraftJobStatus.cs" />
154163
<Compile Include="CrafterJobs\CraftMediaJob.cs" />
155164
<Compile Include="CrafterJobs\CraftUserJob.cs" />
156165
<Compile Include="CrafterJobs\ICraftJob.cs" />
157-
<Compile Include="Crafters\CrafterRepository.cs" />
166+
<Compile Include="Crafters\CrafterFactory.cs" />
158167
<Compile Include="Crafters\ICrafter.cs" />
159168
<Compile Include="Crafters\UserMediaCrafter.cs" />
160169
<Compile Include="Global.asax.cs">
@@ -164,7 +173,7 @@
164173
<Compile Include="Hubs\CraftJobProgressHub.cs" />
165174
<Compile Include="Hubs\CraftLogsHub.cs" />
166175
<Compile Include="Loggers\ICraftLogger.cs" />
167-
<Compile Include="Loggers\LoggersRepository.cs" />
176+
<Compile Include="Loggers\LoggersFactory.cs" />
168177
<Compile Include="Loggers\LogMessageType.cs" />
169178
<Compile Include="Loggers\WebLogger.cs" />
170179
<Compile Include="Models\Posts.cs" />

‎src/InstaCrafter.Core/Loggers/LoggersRepository.cs renamed to ‎src/InstaCrafter.Core/Loggers/LoggersFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace InstaCrafter.Core.Loggers
55
{
6-
public class LoggersRepository
6+
public class LoggersFactory
77
{
88
public ICraftLogger GetWebLogger()
99
{

‎src/InstaCrafter.Core/packages.config

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<packages>
43
<package id="Antlr" version="3.5.0.2" targetFramework="net452" />
4+
<package id="InstagramAPI-Web" version="1.2.1" targetFramework="net452" />
55
<package id="jQuery" version="3.1.1" targetFramework="net452" />
66
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
77
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
@@ -11,13 +11,45 @@
1111
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="2.2.1" targetFramework="net452" />
1212
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net452" />
1313
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
14+
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net452" />
1415
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
1516
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
1617
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
17-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
18+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
1819
<package id="Modernizr" version="2.8.3" targetFramework="net452" />
20+
<package id="NETStandard.Library" version="1.6.0" targetFramework="net452" />
1921
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
20-
<package id="Owin" version="1.0" targetFramework="net45" />
22+
<package id="Owin" version="1.0" targetFramework="net452" />
2123
<package id="Respond" version="1.4.2" targetFramework="net452" />
24+
<package id="System.Collections" version="4.0.11" targetFramework="net452" />
25+
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
26+
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
27+
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net452" />
28+
<package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net452" />
29+
<package id="System.Globalization" version="4.0.11" targetFramework="net452" />
30+
<package id="System.IO" version="4.1.0" targetFramework="net452" />
31+
<package id="System.IO.Compression" version="4.1.0" targetFramework="net452" />
32+
<package id="System.Linq" version="4.1.0" targetFramework="net452" />
33+
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
34+
<package id="System.Net.Http" version="4.1.0" targetFramework="net452" />
35+
<package id="System.Net.Primitives" version="4.0.11" targetFramework="net452" />
36+
<package id="System.ObjectModel" version="4.0.12" targetFramework="net452" />
37+
<package id="System.Reflection" version="4.1.0" targetFramework="net452" />
38+
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net452" />
39+
<package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net452" />
40+
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
41+
<package id="System.Runtime" version="4.1.0" targetFramework="net452" />
42+
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
43+
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
44+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net452" />
45+
<package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net452" />
46+
<package id="System.Text.Encoding" version="4.0.11" targetFramework="net452" />
47+
<package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net452" />
48+
<package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net452" />
49+
<package id="System.Threading" version="4.0.11" targetFramework="net452" />
50+
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
51+
<package id="System.Threading.Timer" version="4.0.1" targetFramework="net452" />
52+
<package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net452" />
53+
<package id="System.Xml.XDocument" version="4.0.11" targetFramework="net452" />
2254
<package id="WebGrease" version="1.6.0" targetFramework="net452" />
2355
</packages>

‎src/InstaCrafter.DataStore/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
"runtimes": {
5454
"win81-x64": {},
5555
"win10-x64": {},
56-
"ubuntu.14.04-x64": {}
56+
"ubuntu.14.04-x64": {},
57+
"ubuntu.16.10-x64": {}
58+
5759
},
5860
"runtimeOptions": {
5961
"configProperties": {

0 commit comments

Comments
 (0)