Skip to content

Commit

Permalink
Replace deprecated HDT methods
Browse files Browse the repository at this point in the history
  • Loading branch information
riQQ committed Mar 25, 2016
1 parent 463142b commit 77006f7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
24 changes: 12 additions & 12 deletions Hearth Arena Uploader/HearthArenaUploaderLogic.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using HearthArenaUploader.Data;
using Hearthstone_Deck_Tracker;
using Hearthstone_Deck_Tracker.Enums;
using Hearthstone_Deck_Tracker.Hearthstone;
using Hearthstone_Deck_Tracker.Stats;
using Hearthstone_Deck_Tracker.Utility.Logging;
using HtmlAgilityPack;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -39,7 +39,7 @@ public async Task<Result<UploadResults>> LoginAndSubmitArenaRuns(IEnumerable<Dec
CookieContainer cookieContainer = result.ResultData;
if (result.Outcome == UploadResults.Success && cookieContainer != null)
{
Logger.WriteLine(string.Format("Uploading {0} run(s)", runs.Count()), HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine(string.Format("Uploading {0} run(s)", runs.Count()), LogType.Info);
int i = 1;
int max = runs.Count();
foreach (Deck run in runs)
Expand All @@ -52,7 +52,7 @@ public async Task<Result<UploadResults>> LoginAndSubmitArenaRuns(IEnumerable<Dec
if (setProgress != null)
setProgress((double)i++ / max);
}
Logger.WriteLine("Upload successful", HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine("Upload successful", LogType.Info);
return new Result<UploadResults>(UploadResults.Success, string.Empty);
}

Expand Down Expand Up @@ -81,7 +81,7 @@ public async Task<Result<UploadResults>> LoginAndSubmitArenaRuns(IEnumerable<Dec
catch (Exception e)
{
string connectionErrorExtended = connectionError + Environment.NewLine + e.Message + Environment.NewLine + e.StackTrace;
Logger.WriteLine(connectionErrorExtended, HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine(connectionErrorExtended, LogType.Info);
return new Result<CookieContainer, UploadResults>(null, UploadResults.ConnectionError, connectionErrorExtended);
}

Expand Down Expand Up @@ -123,7 +123,7 @@ public async Task<Result<UploadResults>> LoginAndSubmitArenaRuns(IEnumerable<Dec
catch (Exception e)
{
string connectionErrorExtended = connectionError + Environment.NewLine + e.Message + Environment.NewLine + e.StackTrace;
Logger.WriteLine(connectionErrorExtended, HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine(connectionErrorExtended, LogType.Info);
return new Result<CookieContainer, UploadResults>(null, UploadResults.ConnectionError, connectionErrorExtended);
}

Expand All @@ -138,17 +138,17 @@ public async Task<Result<UploadResults>> LoginAndSubmitArenaRuns(IEnumerable<Dec
{
if (webResponseLogin.ResponseUri.AbsoluteUri == uriLogin.ToString())
{
Logger.WriteLine("Login to Hearth Arena failed: wrong credentials", HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine("Login to Hearth Arena failed: wrong credentials", LogType.Info);
return new Result<CookieContainer, UploadResults>(null, UploadResults.LoginFailedCredentialsWrong, "wrong credentials");
}
else
{
Logger.WriteLine("Login to Hearth Arena failed: unknown error (Response url: " + webResponseLogin.ResponseUri.AbsoluteUri + ")", HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine("Login to Hearth Arena failed: unknown error (Response url: " + webResponseLogin.ResponseUri.AbsoluteUri + ")", LogType.Info);
return new Result<CookieContainer, UploadResults>(null, UploadResults.LoginFailedUnknownError, "unknown error (Response url: " + webResponseLogin.ResponseUri.AbsoluteUri + ").");
}
}

Logger.WriteLine("Login to Hearth Arena successful", HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine("Login to Hearth Arena successful", LogType.Info);
return new Result<CookieContainer, UploadResults>(cookieContainer, UploadResults.Success, string.Empty);
}

Expand All @@ -168,7 +168,7 @@ private async Task<Result<UploadResults>> SubmitArenaRun(Deck run, CookieContain
catch (Exception e)
{
string connectionErrorExtended = connectionError + Environment.NewLine + e.Message + Environment.NewLine + e.StackTrace;
Logger.WriteLine(connectionErrorExtended, HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine(connectionErrorExtended, LogType.Info);
return new Result<UploadResults>(UploadResults.ConnectionError, connectionErrorExtended);
}

Expand Down Expand Up @@ -208,7 +208,7 @@ private async Task<Result<UploadResults>> SubmitArenaRun(Deck run, CookieContain
catch (Exception e)
{
string connectionErrorExtended = connectionError + Environment.NewLine + e.Message + Environment.NewLine + e.StackTrace;
Logger.WriteLine(connectionErrorExtended, HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine(connectionErrorExtended, LogType.Info);
return new Result<UploadResults>(UploadResults.ConnectionError, connectionErrorExtended);
}

Expand All @@ -220,8 +220,8 @@ private async Task<Result<UploadResults>> SubmitArenaRun(Deck run, CookieContain
bool success = webResponsePostAddArena.ResponseUri.AbsoluteUri == @"https://www.heartharena.com/my-arenas";
if (!success)
{
Logger.WriteLine("Submitting arena run failed"
+ Environment.NewLine + webResponsePostAddArena.StatusCode + " (" + webResponsePostAddArena.ResponseUri + ")", HearthArenaUploaderPlugin.LogCategory);
Log.WriteLine("Submitting arena run failed"
+ Environment.NewLine + webResponsePostAddArena.StatusCode + " (" + webResponsePostAddArena.ResponseUri + ")", LogType.Info);
}

PluginSettings.Instance.UploadedDecks.Add(run.DeckId);
Expand Down
2 changes: 0 additions & 2 deletions Hearth Arena Uploader/HearthArenaUploaderPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ namespace HearthArenaUploader
{
public class HearthArenaUploaderPlugin : Hearthstone_Deck_Tracker.Plugins.IPlugin
{
public static readonly string LogCategory = "HearthArenaUploader";

public void OnLoad()
{
PluginSettings.Load();
Expand Down

0 comments on commit 77006f7

Please sign in to comment.