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

repo, listener base: make syncdown queue handle multiple channels

Browse source
This commit is contained in:
Hylke Bons 2011-05-22 18:37:36 +01:00
parent b4329eb928
commit 2e6d8ac33e
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
SparkleLib/SparkleListenerBase.cs
View file

@ -100,10 +100,10 @@ namespace SparkleLib {
// Announcements that weren't sent off // Announcements that weren't sent off
// because we were disconnected // because we were disconnected
protected List<SparkleAnnouncement> announce_queue = new List<SparkleAnnouncement> (); protected List<SparkleAnnouncement> queue_up = new List<SparkleAnnouncement> ();
protected List<SparkleAnnouncement> queue_down = new List<SparkleAnnouncement> ();
protected string server; protected string server;
protected List<string> channels = new List<string> (); protected List<string> channels = new List<string> ();
protected int changes_queue = 0;
protected bool is_connecting; protected bool is_connecting;
@ -117,14 +117,6 @@ namespace SparkleLib {
} }
// Announcements of remote changes that we've received
public int ChangesQueue {
get {
return this.changes_queue;
}
}
public bool IsConnecting { public bool IsConnecting {
get { get {
return this.is_connecting; return this.is_connecting;
@ -138,14 +130,21 @@ namespace SparkleLib {
Announce (announcement); Announce (announcement);
} else { } else {
SparkleHelpers.DebugInfo ("Listener", "Not connected to " + this.server + ". Queuing message"); SparkleHelpers.DebugInfo ("Listener", "Not connected to " + this.server + ". Queuing message");
this.announce_queue.Add (announcement); this.queue_up.Add (announcement);
} }
} }
public void DecrementChangesQueue () public bool HasQueueDownAnnouncement (string folder_identifier)
{ {
this.changes_queue--; foreach (SparkleAnnouncement announcement in this.queue_down) {
if (announcement.FolderIdentifier.Equals (folder_identifier)) {
this.queue_down.Remove (announcement);
return true;
}
}
return false;
} }
@ -156,12 +155,12 @@ namespace SparkleLib {
if (Connected != null) if (Connected != null)
Connected (); Connected ();
if (this.announce_queue.Count > 0) { if (this.queue_up.Count > 0) {
SparkleHelpers.DebugInfo ("Listener", "Delivering queued messages..."); SparkleHelpers.DebugInfo ("Listener", "Delivering queued messages...");
foreach (SparkleAnnouncement announcement in this.announce_queue) foreach (SparkleAnnouncement announcement in this.queue_up)
AnnounceBase (announcement); AnnounceBase (announcement);
this.announce_queue = new List<SparkleAnnouncement> (); this.queue_up = new List<SparkleAnnouncement> ();
} }
} }
@ -179,7 +178,7 @@ namespace SparkleLib {
{ {
SparkleHelpers.DebugInfo ("Listener", "Got message from " + announcement.FolderIdentifier + " on " + this.server); SparkleHelpers.DebugInfo ("Listener", "Got message from " + announcement.FolderIdentifier + " on " + this.server);
this.changes_queue++; this.queue_down.Add (announcement);
if (RemoteChange != null) if (RemoteChange != null)
RemoteChange (announcement); RemoteChange (announcement);

15
SparkleLib/SparkleRepoBase.cs
View file

@ -17,7 +17,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; // remove
using System.IO; using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Timers; using System.Timers;
@ -117,10 +116,10 @@ namespace SparkleLib {
if (this.is_polling && !this.listener.IsConnecting) if (this.is_polling && !this.listener.IsConnecting)
this.listener.Connect (); this.listener.Connect ();
if (HasUnsyncedChanges){ // In the unlikely case that we haven't synced up our
Console.WriteLine ("!!!!!!!!!!!!!!!!!!!!!!!!!");Console.WriteLine ("!!!!!!!!!!!!!!!!!!!!!!!!!");Console.WriteLine ("!!!!!!!!!!!!!!!!!!!!!!!!!"); // changes or the server was down, sync up again
if (HasUnsyncedChanges)
SyncUpBase (); SyncUpBase ();
}
}; };
this.remote_timer.Start (); this.remote_timer.Start ();
@ -269,16 +268,16 @@ namespace SparkleLib {
// Fetch changes when there is a message in the irc channel // Fetch changes when there is a message in the irc channel
this.listener.RemoteChange += delegate (SparkleAnnouncement announcement) { this.listener.RemoteChange += delegate (SparkleAnnouncement announcement) {
if (announcement.FolderIdentifier == Identifier && string identifier = Identifier;
if (announcement.FolderIdentifier == identifier &&
!announcement.Message.Equals (CurrentRevision)) { !announcement.Message.Equals (CurrentRevision)) {
if ((Status != SyncStatus.SyncUp) && if ((Status != SyncStatus.SyncUp) &&
(Status != SyncStatus.SyncDown) && (Status != SyncStatus.SyncDown) &&
!this.is_buffering) { !this.is_buffering) {
while (this.listener.ChangesQueue > 0) { while (this.listener.HasQueueDownAnnouncement (identifier))
SyncDownBase (); SyncDownBase ();
this.listener.DecrementChangesQueue ();
}
} }
} }
}; };