Smartcraft-Media-Tech/ntfysh-windows
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

Fix topic uniqueness issue

Browse Source
This commit is contained in:
Alexander Horner
2022-12-06 20:14:45 +00:00
parent 6aa48fdd2f
commit 5a4dfc01b6
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ntfysh_client/NotificationListener.cs
View File

@@ -20,7 +20,7 @@ namespace ntfysh_client
private bool disposedValue;
public readonly Dictionary<string, SubscribedTopic> SubscribedTopics = new Dictionary<string, SubscribedTopic>();
public readonly Dictionary<string, SubscribedTopic> SubscribedTopicsByUnique = new Dictionary<string, SubscribedTopic>();
public delegate void NotificationReceiveHandler(object sender, NotificationReceiveEventArgs e);
public event NotificationReceiveHandler OnNotificationReceive;
@@ -33,7 +33,7 @@ namespace ntfysh_client
ServicePointManager.DefaultConnectionLimit = 100;
}
public async Task SubscribeToTopic(string topicId, string serverUrl, string username, string password)
public async Task SubscribeToTopic(string unique, string topicId, string serverUrl, string username, string password)
{
if (string.IsNullOrWhiteSpace(username)) username = null;
if (string.IsNullOrWhiteSpace(password)) password = null;
@@ -53,7 +53,7 @@ namespace ntfysh_client
{
using (StreamReader reader = new StreamReader(body))
{
SubscribedTopics.Add(topicId, new SubscribedTopic(topicId, serverUrl, username, password, reader));
SubscribedTopicsByUnique.Add(unique, new SubscribedTopic(topicId, serverUrl, username, password, reader));
try
{
@@ -82,9 +82,9 @@ namespace ntfysh_client
// If the topic is still registered, then that stream wasn't mean to be closed (maybe network failure?)
// Restart it
if (SubscribedTopics.ContainsKey(topicId))
if (SubscribedTopicsByUnique.ContainsKey(unique))
{
SubscribeToTopic(topicId, serverUrl, username, password);
SubscribeToTopic(unique, topicId, serverUrl, username, password);
}
}
}
@@ -92,16 +92,17 @@ namespace ntfysh_client
}
}
public void RemoveTopic(string topicId)
public void RemoveTopicByUniqueString(string topicUniqueString)
{
Debug.WriteLine($"Removing topic {topicId}");
Debug.WriteLine($"Removing topic {topicUniqueString}");
if (SubscribedTopics.ContainsKey(topicId))
if (SubscribedTopicsByUnique.ContainsKey(topicUniqueString))
{
// Not moronic to store it in a variable; this solves a race condition in SubscribeToTopic
var topic = SubscribedTopics[topicId];
SubscribedTopics.Remove(topicId);
SubscribedTopic topic = SubscribedTopicsByUnique[topicUniqueString];
topic.Stream.Close();
SubscribedTopicsByUnique.Remove(topicUniqueString);
}
}