Hesham/OWtrack
1
0
Fork 0
Code Issues 2 Pull Requests Releases 10 Wiki Activity

1.4.0 merge #26

Merged
Hesham merged 17 commits from release/1.4 into master 2018-09-27 10:31:11 +02:00
Conversation 0 Commits 17 Files Changed 7 +15 -17
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ccc2028b7f - Show all commits

10
OWTrack/MainForm.cs
View File

@ -32,7 +32,6 @@ namespace OWTrack
Tracker tr = new Tracker(); Tracker tr = new Tracker();
private const string IS_RUNNING = "Running"; private const string IS_RUNNING = "Running";
private const string NOT_RUNNING = " Not running"; private const string NOT_RUNNING = " Not running";
private string savesPath = Directory.GetCurrentDirectory() + "/saves/data.json";
private bool SRonce = false; private bool SRonce = false;
public MainForm() public MainForm()
@ -82,7 +81,7 @@ namespace OWTrack
{ {
try try
{ {
using (StreamReader st = new StreamReader(savesPath)) using (StreamReader st = new StreamReader(Paths.SAVES))
{ {
string line = st.ReadLine(); string line = st.ReadLine();
if (line.Contains("Overwatch.exe")) if (line.Contains("Overwatch.exe"))
@ -122,9 +121,8 @@ namespace OWTrack
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
//tr.gamePath = openFileDialog1.FileName;
MessageBox.Show("Saved Overwatch.exe location.\nPress Clear to rest"); MessageBox.Show("Saved Overwatch.exe location.\nPress Clear to rest");
return openFileDialog1.FileName; return openFileDialog1.FileName;
} }
else else
{ {
@ -137,7 +135,7 @@ namespace OWTrack
{ {
try try
{ {
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(savesPath)); return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Paths.SAVES));
} }
catch (Exception e) catch (Exception e)
{ {
@ -157,7 +155,7 @@ namespace OWTrack
} }
else srLabel.Text = tr.startSR.ToString() + " - " + tr.srDiff(); else srLabel.Text = tr.startSR.ToString() + " - " + tr.srDiff();
srTextBox.Text = null; srTextBox.Text = null;
File.WriteAllText(Directory.GetCurrentDirectory() + "/saves/data.json", JsonConvert.SerializeObject(tr)); File.WriteAllText(Paths.SAVES, JsonConvert.SerializeObject(tr));
} }
#region Events #region Events

22
OWTrack/saveManeger.cs
View File

@ -28,20 +28,20 @@ using System.Threading.Tasks;
namespace OWTrack namespace OWTrack
{ {
class saveManeger static class Paths
{ {
public enum Paths private static string curDir = Directory.GetCurrentDirectory();
{ public static string SAVES = curDir + "/saves/data.json";
saves = "/saves/data.json", public static string JSON = curDir + "/data.json";
saveJsonFile = "/data.json", }
};
private static string savesPath = Directory.GetCurrentDirectory() + "/saves/data.json";
class saveManeger
{
public static Tracker GetSavedTracker() public static Tracker GetSavedTracker()
{ {
try try
{ {
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(savesPath)); return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Paths.SAVES));
} }
catch (Exception e) catch (Exception e)
{ {
@ -54,7 +54,7 @@ namespace OWTrack
{ {
try try
{ {
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(customPath + "/data.json")); return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(customPath));
} }
catch (Exception e) catch (Exception e)
{ {
@ -66,7 +66,7 @@ namespace OWTrack
{ {
try try
{ {
File.WriteAllText(Directory.GetCurrentDirectory() + "/data.json", JsonConvert.SerializeObject(tracker)); File.WriteAllText(Paths.JSON, JsonConvert.SerializeObject(tracker));
return true; return true;
} }
catch (Exception) catch (Exception)
@ -79,7 +79,7 @@ namespace OWTrack
{ {
try try
{ {
if (File.Exists(savesPath)) if (File.Exists(Paths.SAVES))
{ {
return true; return true;
} }