beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[controller] clean up user info members using regex

Browse source
This commit is contained in:
Hylke Bons 2010-11-19 21:26:53 +00:00
parent 8faebdbca0
commit d7662b289f
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
SparkleShare/SparkleController.cs
View file

@ -21,6 +21,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Text.RegularExpressions;
namespace SparkleShare {
@ -491,14 +492,15 @@ namespace SparkleShare {
return "";
StreamReader reader = new StreamReader (global_config_file_path);
string global_config_file = reader.ReadToEnd ();
// Discard the first line
reader.ReadLine ();
Regex regex = new Regex (@"name.+= (.+)");
Match match = regex.Match (global_config_file);
string line = reader.ReadLine ();
reader.Close ();
return line.Substring (line.IndexOf ("=") + 2);
if (match.Success)
return match.Groups [1].Value;
else
return "";
}
@ -523,16 +525,15 @@ namespace SparkleShare {
if (File.Exists (global_config_file_path)) {
StreamReader reader = new StreamReader (global_config_file_path);
string global_config_file = reader.ReadToEnd ();
// TODO: Properly look at the variable name
// Discard the first two lines
reader.ReadLine ();
reader.ReadLine ();
Regex regex = new Regex (@"email.+= (.+)");
Match match = regex.Match (global_config_file);
string line = reader.ReadLine ();
reader.Close ();
return line.Substring (line.IndexOf ("=") + 2);
if (match.Success)
return match.Groups [1].Value;
else
return "";
} else { // Secondly, look at the user's private key file name
@ -547,12 +548,13 @@ namespace SparkleShare {
if (file_name.StartsWith ("sparkleshare.") && file_name.EndsWith (".key")) {
string email = "";
Regex regex = new Regex (@"^sparkleshare\.(*)\.key$");
Match match = regex.Match (file_name);
email = file_name.Substring (file_name.IndexOf (".") + 1);
email = email.Substring (0, email.LastIndexOf ("."));
return email;
if (match.Success)
return match.Groups [1].Value;
else
return "";
}