listener: rename some methods
This commit is contained in:
parent
cded663950
commit
301fa1a421
|
@ -40,8 +40,8 @@ namespace SparkleLib {
|
|||
public abstract void Connect ();
|
||||
public abstract bool IsConnected { get; }
|
||||
public abstract bool IsConnecting { get; }
|
||||
protected abstract void Announce (SparkleAnnouncement announcent);
|
||||
protected abstract void AlsoListenTo (string folder_identifier);
|
||||
protected abstract void AnnounceInternal (SparkleAnnouncement announcent);
|
||||
protected abstract void AlsoListenToInternal (string folder_identifier);
|
||||
|
||||
|
||||
protected List<string> channels = new List<string> ();
|
||||
|
@ -78,7 +78,7 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
public void AnnounceBase (SparkleAnnouncement announcement)
|
||||
public void Announce (SparkleAnnouncement announcement)
|
||||
{
|
||||
if (!IsRecentAnnouncement (announcement)) {
|
||||
if (IsConnected) {
|
||||
|
@ -86,7 +86,7 @@ namespace SparkleLib {
|
|||
"Announcing message " + announcement.Message + " to " +
|
||||
announcement.FolderIdentifier + " on " + Server);
|
||||
|
||||
Announce (announcement);
|
||||
AnnounceInternal (announcement);
|
||||
AddRecentAnnouncement (announcement);
|
||||
|
||||
} else {
|
||||
|
@ -105,15 +105,14 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
// TODO: rename override method instead?
|
||||
public void AlsoListenToBase (string channel)
|
||||
public void AlsoListenTo (string channel)
|
||||
{
|
||||
if (!this.channels.Contains (channel) && IsConnected) {
|
||||
SparkleHelpers.DebugInfo ("Listener",
|
||||
"Subscribing to channel " + channel);
|
||||
|
||||
this.channels.Add (channel);
|
||||
AlsoListenTo (channel);
|
||||
AlsoListenToInternal (channel);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -138,7 +137,7 @@ namespace SparkleLib {
|
|||
|
||||
foreach (KeyValuePair<string, SparkleAnnouncement> item in this.queue_up) {
|
||||
SparkleAnnouncement announcement = item.Value;
|
||||
AnnounceBase (announcement);
|
||||
Announce (announcement);
|
||||
}
|
||||
|
||||
this.queue_down.Clear ();
|
||||
|
|
|
@ -64,7 +64,7 @@ namespace SparkleLib {
|
|||
|
||||
// We already seem to have a listener for this server,
|
||||
// refer to the existing one instead
|
||||
listener.AlsoListenToBase (folder_identifier);
|
||||
listener.AlsoListenTo (folder_identifier);
|
||||
return (SparkleListenerBase) listener;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -83,15 +83,8 @@ namespace SparkleLib {
|
|||
OnConnected ();
|
||||
|
||||
// Subscribe to channels of interest to us
|
||||
foreach (string channel in base.channels) {
|
||||
SparkleHelpers.DebugInfo ("ListenerTcp",
|
||||
"Subscribing to channel " + channel + " on " + Server);
|
||||
|
||||
byte [] subscribe_bytes =
|
||||
Encoding.UTF8.GetBytes ("subscribe " + channel + "\n");
|
||||
|
||||
this.socket.Send (subscribe_bytes);
|
||||
}
|
||||
foreach (string channel in base.channels)
|
||||
AlsoListenToInternal (channel);
|
||||
}
|
||||
|
||||
} catch (SocketException e) {
|
||||
|
@ -204,8 +197,11 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
protected override void AlsoListenTo (string folder_identifier)
|
||||
protected override void AlsoListenToInternal (string folder_identifier)
|
||||
{
|
||||
SparkleHelpers.DebugInfo ("ListenerTcp",
|
||||
"Subscribing to channel " + folder_identifier + " on " + Server);
|
||||
|
||||
string to_send = "subscribe " + folder_identifier + "\n";
|
||||
|
||||
try {
|
||||
|
@ -223,7 +219,7 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
protected override void Announce (SparkleAnnouncement announcement)
|
||||
protected override void AnnounceInternal (SparkleAnnouncement announcement)
|
||||
{
|
||||
string to_send = "announce " + announcement.FolderIdentifier
|
||||
+ " " + announcement.Message + "\n";
|
||||
|
|
|
@ -352,7 +352,7 @@ namespace SparkleLib {
|
|||
if (SyncStatusChanged != null)
|
||||
SyncStatusChanged (SyncStatus.Idle);
|
||||
|
||||
this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision));
|
||||
this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision));
|
||||
|
||||
} else {
|
||||
SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Error");
|
||||
|
@ -367,7 +367,7 @@ namespace SparkleLib {
|
|||
if (SyncStatusChanged != null)
|
||||
SyncStatusChanged (SyncStatus.Idle);
|
||||
|
||||
this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision));
|
||||
this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision));
|
||||
|
||||
} else {
|
||||
this.server_online = false;
|
||||
|
|
Loading…
Reference in a new issue