Skip to content

Commit

Permalink
Merge pull request shadowsocks#438 from Licshee/using-StringEx
Browse files Browse the repository at this point in the history
Using StringEx
  • Loading branch information
GangZhuo committed Feb 24, 2016
2 parents 6a8f554 + dbab0c1 commit 3c8ff1c
Show file tree
Hide file tree
Showing 14 changed files with 332 additions and 56 deletions.
5 changes: 2 additions & 3 deletions shadowsocks-csharp/Controller/I18N.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ static I18N()
{
using (var sr = new StringReader(Resources.cn))
{
string line;
while ((line = sr.ReadLine()) != null)
foreach (var line in sr.NonWhiteSpaceLines())
{
if (line == "" || line[0] == '#')
if (line[0] == '#')
continue;

var pos = line.IndexOf('=');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private async void FilterRawStatistics()
{
var currentHour = DateTime.Now.Hour;
filteredData = filteredData.Where(data =>
data.Timestamp != UnknownDateTime && data.Timestamp.Hour.Equals(currentHour)
data.Timestamp != UnknownDateTime && data.Timestamp.Hour == currentHour
);
if (filteredData.LongCount() == 0) return;
}
Expand Down
11 changes: 5 additions & 6 deletions shadowsocks-csharp/Controller/Service/GfwListUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public ResultEventArgs(bool success)
}
}

private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
private void http_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
{
try
Expand All @@ -41,10 +42,9 @@ private void http_DownloadStringCompleted(object sender, DownloadStringCompleted
string local = File.ReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8);
using (var sr = new StringReader(local))
{
string rule;
while ((rule = sr.ReadLine()) != null)
foreach (var rule in sr.NonWhiteSpaceLines())
{
if (rule == "" || rule[0] == '!' || rule[0] == '[')
if (rule.BeginWithAny(IgnoredLineBegins))
continue;
lines.Add(rule);
}
Expand Down Expand Up @@ -99,10 +99,9 @@ public static List<string> ParseResult(string response)
List<string> valid_lines = new List<string>();
using (var sr = new StringReader(content))
{
string line;
while ((line = sr.ReadLine()) != null)
foreach (var line in sr.NonWhiteSpaceLines())
{
if (line == "" || line[0] == '!' || line[0] == '[')
if (line.BeginWithAny(IgnoredLineBegins))
continue;
valid_lines.Add(line);
}
Expand Down
6 changes: 3 additions & 3 deletions shadowsocks-csharp/Controller/ShadowsocksController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ private void pacServer_PACUpdateError(object sender, ErrorEventArgs e)
UpdatePACFromGFWListError(this, e);
}

private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
private void pacServer_UserRuleFileChanged(object sender, EventArgs e)
{
// TODO: this is a dirty hack. (from code GListUpdater.http_DownloadStringCompleted())
Expand All @@ -456,10 +457,9 @@ private void pacServer_UserRuleFileChanged(object sender, EventArgs e)
string local = File.ReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8);
using (var sr = new StringReader(local))
{
string rule;
while ((rule = sr.ReadLine()) != null)
foreach (var rule in sr.NonWhiteSpaceLines())
{
if (rule == "" || rule[0] == '!' || rule[0] == '[')
if (rule.BeginWithAny(IgnoredLineBegins))
continue;
lines.Add(rule);
}
Expand Down
2 changes: 1 addition & 1 deletion shadowsocks-csharp/Controller/System/SystemProxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static void Update(Configuration config, bool forceDisable)
else
{
string pacUrl;
if (config.useOnlinePac && !string.IsNullOrEmpty(config.pacUrl))
if (config.useOnlinePac && !config.pacUrl.IsNullOrEmpty())
pacUrl = config.pacUrl;
else
pacUrl = $"http://127.0.0.1:{config.localPort}/pac?t={GetTimestamp(DateTime.Now)}";
Expand Down
2 changes: 1 addition & 1 deletion shadowsocks-csharp/Encryption/EncryptorFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static EncryptorFactory()

public static IEncryptor GetEncryptor(string method, string password, bool onetimeauth, bool isudp)
{
if (string.IsNullOrEmpty(method))
if (method.IsNullOrEmpty())
{
method = "aes-256-cfb";
}
Expand Down
4 changes: 2 additions & 2 deletions shadowsocks-csharp/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura />
<Caseless StringComparison="Ordinal" />
<Caseless StringComparison="Ordinal"/>
<Costura/>
</Weavers>
4 changes: 2 additions & 2 deletions shadowsocks-csharp/Model/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ public static void CheckLocalPort(int port)

private static void CheckPassword(string password)
{
if (string.IsNullOrEmpty(password))
if (password.IsNullOrEmpty())
throw new ArgumentException(I18N.GetString("Password can not be blank"));
}

private static void CheckServer(string server)
{
if (string.IsNullOrEmpty(server))
if (server.IsNullOrEmpty())
throw new ArgumentException(I18N.GetString("Server IP can not be blank"));
}
}
Expand Down
4 changes: 2 additions & 2 deletions shadowsocks-csharp/Model/Server.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ public override bool Equals(object obj)

public string FriendlyName()
{
if (string.IsNullOrEmpty(server))
if (server.IsNullOrEmpty())
{
return I18N.GetString("New server");
}
if (string.IsNullOrEmpty(remarks))
if (remarks.IsNullOrEmpty())
{
return server + ":" + server_port;
}
Expand Down
237 changes: 237 additions & 0 deletions shadowsocks-csharp/StringEx.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;

static partial class StringEx
{
#pragma warning disable 1591

public static StringComparison GlobalDefaultComparison { get; set; } = StringComparison.Ordinal;

[ThreadStatic]
private static StringComparison? _DefaultComparison;
public static StringComparison DefaultComparison
{
get { return _DefaultComparison ?? GlobalDefaultComparison; }
set { _DefaultComparison = value; }
}

#region basic String methods

public static bool IsNullOrEmpty(this string value)
=> string.IsNullOrEmpty(value);

public static bool IsNullOrWhiteSpace(this string value)
=> string.IsNullOrWhiteSpace(value);

public static bool IsWhiteSpace(this string value)
{
foreach(var c in value)
{
if (char.IsWhiteSpace(c)) continue;

return false;
}
return true;
}

#if !PCL
public static string IsInterned(this string value)
{
if (value == null)
throw new ArgumentNullException(nameof(value));

return string.IsInterned(value);
}

public static string Intern(this string value)
{
if (value == null)
throw new ArgumentNullException(nameof(value));

return string.Intern(value);
}
#endif

#endregion

#region comparing

#region Is

public static bool Is(this string a, string b)
=> string.Equals(a, b, DefaultComparison);
public static bool Is(this string a, string b, StringComparison comparisonType)
=> string.Equals(a, b, comparisonType);

#endregion

#region BeginWith

public static bool BeginWith(this string s, char c)
{
if (s.IsNullOrEmpty()) return false;
return s[0] == c;
}
public static bool BeginWithAny(this string s, IEnumerable<char> chars)
{
if (s.IsNullOrEmpty()) return false;
return chars.Contains(s[0]);
}
public static bool BeginWithAny(this string s, params char[] chars)
=> s.BeginWithAny(chars.AsEnumerable());

public static bool BeginWith(this string a, string b)
{
if (a == null || b == null) return false;

return a.StartsWith(b, DefaultComparison);
}
public static bool BeginWith(this string a, string b, StringComparison comparisonType)
{
if (a == null || b == null) return false;

return a.StartsWith(b, comparisonType);
}
#if !PCL
public static bool BeginWith(this string a, string b, bool ignoreCase, CultureInfo culture)
{
if (a == null || b == null) return false;

return a.StartsWith(b, ignoreCase, culture);
}
#endif

#endregion

#region FinishWith

public static bool FinishWith(this string s, char c)
{
if (s.IsNullOrEmpty()) return false;
return s.Last() == c;
}
public static bool FinishWithAny(this string s, IEnumerable<char> chars)
{
if (s.IsNullOrEmpty()) return false;
return chars.Contains(s.Last());
}
public static bool FinishWithAny(this string s, params char[] chars)
=> s.FinishWithAny(chars.AsEnumerable());

public static bool FinishWith(this string a, string b)
{
if (a == null || b == null) return false;

return a.EndsWith(b, DefaultComparison);
}
public static bool FinishWith(this string a, string b, StringComparison comparisonType)
{
if (a == null || b == null) return false;

return a.EndsWith(b, comparisonType);
}
#if !PCL
public static bool FinishWith(this string a, string b, bool ignoreCase, CultureInfo culture)
{
if (a == null || b == null) return false;

return a.EndsWith(b, ignoreCase, culture);
}
#endif

#endregion

#endregion

#region ToLines

public static IEnumerable<string> ToLines(this TextReader reader)
{
string line;
while ((line = reader.ReadLine()) != null)
yield return line;
}
public static IEnumerable<string> NonEmptyLines(this TextReader reader)
{
string line;
while ((line = reader.ReadLine()) != null)
{
if (line == "") continue;
yield return line;
}
}
public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
{
string line;
while ((line = reader.ReadLine()) != null)
{
if (line.IsWhiteSpace()) continue;
yield return line;
}
}

#endregion

#region others

private static readonly char[][] Quotes = new[]
{
"\"\"",
"''",
"“”",
"‘’",
"『』",
"「」",
"〖〗",
"【】",
}.Select(s => s.ToCharArray()).ToArray();
public static string Enquote(this string value)
{
if (value == null)
return "(null)";

foreach (var pair in Quotes)
{
if (value.IndexOfAny(pair) < 0)
return pair[0] + value + pair[1];
}

return '"' + value.Replace("\\", @"\\").Replace("\"", @"\""") + '"';
}

public static string Replace(this string value, string find, string rep, StringComparison comparsionType)
{
if (find.IsNullOrEmpty())
throw new ArgumentException(null, nameof(find));
if (rep == null)
rep = "";
if (value.IsNullOrEmpty())
return value;

var sb = new StringBuilder(value.Length);

var last = 0;
var len = find.Length;
var idx = value.IndexOf(find, DefaultComparison);
while (idx != -1)
{
sb.Append(value.Substring(last, idx - last));
sb.Append(rep);
idx += len;

last = idx;
idx = value.IndexOf(find, idx, comparsionType);
}
sb.Append(value.Substring(last));

return sb.ToString();
}
public static string ReplaceEx(this string value, string find, string rep)
=> value.Replace(find, rep, DefaultComparison);

#endregion
}
6 changes: 3 additions & 3 deletions shadowsocks-csharp/View/MenuViewController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -630,11 +630,11 @@ private void OnlinePACItem_Click(object sender, EventArgs e)
{
if (!onlinePACItem.Checked)
{
if (String.IsNullOrEmpty(controller.GetConfigurationCopy().pacUrl))
if (controller.GetConfigurationCopy().pacUrl.IsNullOrEmpty())
{
UpdateOnlinePACURLItem_Click(sender, e);
}
if (!String.IsNullOrEmpty(controller.GetConfigurationCopy().pacUrl))
if (!controller.GetConfigurationCopy().pacUrl.IsNullOrEmpty())
{
localPACItem.Checked = false;
onlinePACItem.Checked = true;
Expand All @@ -651,7 +651,7 @@ private void UpdateOnlinePACURLItem_Click(object sender, EventArgs e)
I18N.GetString("Please input PAC Url"),
I18N.GetString("Edit Online PAC URL"),
origPacUrl, -1, -1);
if (!string.IsNullOrEmpty(pacUrl) && pacUrl != origPacUrl)
if (!pacUrl.IsNullOrEmpty() && pacUrl != origPacUrl)
{
controller.SavePACUrl(pacUrl);
}
Expand Down
Loading

0 comments on commit 3c8ff1c

Please sign in to comment.