Profiles could be in different folders now, vocaluxe loads profiles from main-folder and user-folder, new profiles will be saved in user-folder.

This commit is contained in:
flokuep authored and Stephan Sundermann committed 2013-08-31 13:42:31 +02:00
1 parent 00f3a3aed2
commit afdd3cae62
8 files changed
+54 -23

No files matched your search

+17 -8
View File
@@ -36,6 +36,7 @@ namespace VocaluxeLib.Profile
public int ID;
public string PlayerName;
public string FilePath;
public string FileName;
public string AvatarFileName;
@@ -69,14 +70,20 @@ namespace VocaluxeLib.Profile
public bool LoadProfile()
{
return LoadProfile(FileName);
return LoadProfile(FilePath, FileName);
}
public bool LoadProfile(string fileName)
public bool LoadProfile(string file)
{
FileName = fileName;
FileName = Path.GetFileName(file);
FilePath = Path.GetDirectoryName(file);
CXMLReader xmlReader = CXMLReader.OpenFile(FileName);
return LoadProfile(FilePath, FileName);
}
public bool LoadProfile(string pathName, string fileName)
{
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(FilePath, FileName));
if (xmlReader == null)
return false;
@@ -99,6 +106,8 @@ namespace VocaluxeLib.Profile
public void SaveProfile()
{
if (String.IsNullOrEmpty(FilePath))
FilePath = Path.Combine(CBase.Settings.GetDataPath(),CBase.Settings.GetFolderProfiles());
if (FileName == String.Empty)
{
string filename = string.Empty;
@@ -114,14 +123,14 @@ namespace VocaluxeLib.Profile
filename = "1";
int i = 0;
while (File.Exists(Path.Combine(CBase.Settings.GetFolderProfiles(), filename + ".xml")))
while (File.Exists(Path.Combine(FilePath, filename + ".xml")))
{
i++;
if (!File.Exists(Path.Combine(CBase.Settings.GetFolderProfiles(), filename + i + ".xml")))
if (!File.Exists(Path.Combine(FilePath, filename + i + ".xml")))
filename += i;
}
FileName = Path.Combine(Environment.CurrentDirectory, CBase.Settings.GetFolderProfiles(), filename + ".xml");
FileName = filename + ".xml";
}
if (FileName == String.Empty)
@@ -130,7 +139,7 @@ namespace VocaluxeLib.Profile
XmlWriter writer;
try
{
writer = XmlWriter.Create(FileName, _Settings);
writer = XmlWriter.Create(Path.Combine(FilePath, FileName), _Settings);
}
catch (Exception e)
{