1.3 Merge #17

Merged
Hesham merged 11 commits from Dev into master 2018-09-04 20:01:39 +02:00
2 changed files with 96 additions and 7 deletions
Showing only changes of commit cab6bfd573 - Show all commits

View File

@ -50,19 +50,42 @@ namespace OWTrack
tr.losses = savedTracker().losses;
tr.newSR = savedTracker().newSR;
tr.startSR = savedTracker().startSR;
tr.gamePath = savedTracker().gamePath;
update();
}
else MessageBox.Show("no save");
}
}
private bool saveExist()
{
try
{
if (File.Exists(Directory.GetCurrentDirectory() + "/data.json")) { return true; }
if (File.Exists(Directory.GetCurrentDirectory() + "/data.json"))
{
using (StreamReader st = new StreamReader(Directory.GetCurrentDirectory() + "/data.json"))
{
string line = st.ReadLine();
if (line.Contains("Overwatch.exe"))
{
st.Close();
return true;
}
else
{
if (!tr.LoacteOW())
{
getGamePath();
st.Close();
}
return true;
}
}
}
else
{
getGamePath();
if (!tr.LoacteOW())
{
getGamePath();
}
return false;
}
}
@ -84,6 +107,7 @@ namespace OWTrack
if (openFileDialog1.ShowDialog() == DialogResult.OK)
{
tr.gamePath = openFileDialog1.FileName;
update();
}
}

View File

@ -2,13 +2,15 @@
using System.Diagnostics;
using System.Linq;
using System.IO;
using System.Windows.Forms;
using System.Collections.Generic;
namespace OWTrack
{
class Tracker
{
public int wins, losses, startSR, newSR = 0;
public string gamePath;
public string gamePath;
public void Track() { }
public void reset() { wins = 0; losses = 0; startSR = 0; newSR = 0; }
@ -21,7 +23,6 @@ namespace OWTrack
public void setNewSR(int SR) { newSR = SR; }
public int srDiff() { return newSR - startSR; }
public bool owRunning()
{
try
@ -35,6 +36,70 @@ namespace OWTrack
Exception ex = new Exception("Error in tracking Overwatch.exe");
throw ex;
}
}
}
/// <summary>
/// Not Working!
/// </summary>
/// <returns></returns>
public bool LoacteOW()
{
try
{
List<string> paths = new List<string>();
string[] filesC = null;
string[] filesD = null;
if (ProgramFilesExist('c')) { filesC = Directory.GetFiles("C:\\Program Files", "Overwatch.exe", SearchOption.AllDirectories); }
if (ProgramFilesExist('d')) { filesD = Directory.GetFiles("D:\\Program Files", "Overwatch.exe", SearchOption.AllDirectories); }
if (filesC != null)
{
for (int i = 0; i < filesC.Length; i++)
{
if (filesC[i].Contains("Overwatch.exe"))
{
paths.Add(filesC[i]);
}
}
}
if (filesD != null)
{
for (int i = 0; i < filesD.Length - 1; i++)
{
if (filesD[i].Contains("Overwatch.exe"))
{
paths.Add(filesD[i]);
}
}
}
if (paths.Count > 1)
{
//TODO: ask about correct path
return true;
}
else if (paths.Count == 1)
{
gamePath = paths[0];
return true;
}
else return false;
}
catch (Exception e)
{
MessageBox.Show(e.Message);
return false;
}
}
private bool ProgramFilesExist(char drive)
{
return Directory.Exists(drive+":\\Program Files");
}
}
}