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

Merge pull request #1131 from brandondahler/CultureFix

Browse source 
Manually set locale to en-US for parsing numbers out of git output
This commit is contained in:
Hylke Bons 2013-01-02 10:19:53 -08:00
parent 8eed12ff30 75021f7444
commit 06840064b5
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SparkleLib/Git/SparkleFetcherGit.cs
View file

@ -12,15 +12,15 @@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Diagnostics;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
using SparkleLib;
namespace SparkleLib.Git {
@ -135,7 +135,7 @@ namespace SparkleLib.Git {
double number = 0.0;
if (match.Success) {
number = double.Parse (match.Groups [1].Value);
number = double.Parse (match.Groups [1].Value, new CultureInfo("en-US"));
// The cloning progress consists of two stages: the "Compressing
// objects" stage which we count as 20% of the total progress, and

28
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -12,16 +12,16 @@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using SparkleLib;
namespace SparkleLib.Git {
@ -257,7 +257,7 @@ namespace SparkleLib.Git {
double number = 0.0;
if (match.Success) {
number = double.Parse (match.Groups [1].Value);
number = double.Parse (match.Groups [1].Value, new CultureInfo("en-US"));
// The pushing progress consists of two stages: the "Compressing
// objects" stage which we count as 20% of the total progress, and
@ -272,7 +272,7 @@ namespace SparkleLib.Git {
Match speed_match = this.speed_regex.Match (line);
if (speed_match.Success) {
speed = double.Parse (speed_match.Groups [1].Value) * 1024;
speed = double.Parse (speed_match.Groups [1].Value, new CultureInfo("en-US")) * 1024;
if (speed_match.Groups [2].Value.Equals ("M"))
speed = speed * 1024;
@ -339,7 +339,7 @@ namespace SparkleLib.Git {
double number = 0.0;
if (match.Success) {
number = double.Parse (match.Groups [1].Value);
number = double.Parse (match.Groups [1].Value, new CultureInfo("en-US"));
// The fetching progress consists of two stages: the "Compressing
// objects" stage which we count as 20% of the total progress, and
@ -354,7 +354,7 @@ namespace SparkleLib.Git {
Match speed_match = this.speed_regex.Match (line);
if (speed_match.Success) {
speed = double.Parse (speed_match.Groups [1].Value) * 1024;
speed = double.Parse (speed_match.Groups [1].Value, new CultureInfo("en-US")) * 1024;
if (speed_match.Groups [2].Value.Equals ("M"))
speed = speed * 1024;