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

repo: simplify remote timer check

Browse source
This commit is contained in:
Hylke Bons 2012-07-19 22:05:29 +02:00
parent 91c10c6cf6
commit 32848f8772
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SparkleLib/SparkleRepoBase.cs
View file

@ -155,8 +155,11 @@ namespace SparkleLib {
new Thread (() => CreateListener ()).Start (); new Thread (() => CreateListener ()).Start ();
this.remote_timer.Elapsed += delegate { this.remote_timer.Elapsed += delegate {
bool time_to_poll = (DateTime.Compare (this.last_poll, if (this.is_syncing || IsBuffering)
DateTime.Now.Subtract (this.poll_interval)) < 0); return;
int time_comparison = DateTime.Compare (this.last_poll, DateTime.Now.Subtract (this.poll_interval));
bool time_to_poll = (time_comparison < 0);
if (time_to_poll && !is_syncing) { if (time_to_poll && !is_syncing) {
this.last_poll = DateTime.Now; this.last_poll = DateTime.Now;
@ -210,9 +213,7 @@ namespace SparkleLib {
return; return;
SparkleHelpers.DebugInfo ("Local", Name + " | Activity detected, waiting for it to settle..."); SparkleHelpers.DebugInfo ("Local", Name + " | Activity detected, waiting for it to settle...");
IsBuffering = true; IsBuffering = true;
this.remote_timer.Stop ();
List<double> size_buffer = new List<double> (); List<double> size_buffer = new List<double> ();
@ -246,8 +247,6 @@ namespace SparkleLib {
} }
} while (IsBuffering); } while (IsBuffering);
this.remote_timer.Start ();
} }
@ -279,7 +278,6 @@ namespace SparkleLib {
SparkleHelpers.DebugInfo ("SyncUp", Name + " | Initiated"); SparkleHelpers.DebugInfo ("SyncUp", Name + " | Initiated");
HasUnsyncedChanges = true; HasUnsyncedChanges = true;
this.remote_timer.Stop ();
SyncStatusChanged (SyncStatus.SyncUp); SyncStatusChanged (SyncStatus.SyncUp);
if (SyncUp ()) { if (SyncUp ()) {
@ -306,8 +304,6 @@ namespace SparkleLib {
} }
} }
this.remote_timer.Start ();
ProgressPercentage = 0.0; ProgressPercentage = 0.0;
ProgressSpeed = ""; ProgressSpeed = "";
} }
@ -316,7 +312,6 @@ namespace SparkleLib {
private void SyncDownBase () private void SyncDownBase ()
{ {
SparkleHelpers.DebugInfo ("SyncDown", Name + " | Initiated"); SparkleHelpers.DebugInfo ("SyncDown", Name + " | Initiated");
this.remote_timer.Stop ();
SyncStatusChanged (SyncStatus.SyncDown); SyncStatusChanged (SyncStatus.SyncDown);
string pre_sync_revision = CurrentRevision; string pre_sync_revision = CurrentRevision;
@ -365,8 +360,6 @@ namespace SparkleLib {
ProgressSpeed = ""; ProgressSpeed = "";
SyncStatusChanged (SyncStatus.Idle); SyncStatusChanged (SyncStatus.Idle);
this.remote_timer.Start ();
} }