mirror of
https://github.com/ckaczor/FeedCenter.git
synced 2026-01-14 01:25:38 -05:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e2e7aabe8 | |||
| 7ee84f079b | |||
| 8f70003bef | |||
| 38f093dc5c | |||
| e5bdc80d10 | |||
| 260268194a | |||
| 8ecde89be0 | |||
| 845e80577c | |||
| 31a04b13e6 | |||
| 64d893ae0f |
@@ -34,7 +34,7 @@
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Controls.Toolbar" Version="1.0.3" />
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Validation" Version="1.0.4" />
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Windows.ControlBox" Version="1.0.3" />
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Windows.SnappingWindow" Version="1.0.3" />
|
||||
<PackageReference Include="ChrisKaczor.Wpf.Windows.SnappingWindow" Version="1.0.4" />
|
||||
<PackageReference Include="Dapper" Version="2.0.123" />
|
||||
<PackageReference Include="DebounceThrottle" Version="2.0.0" />
|
||||
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.108" />
|
||||
@@ -44,7 +44,7 @@
|
||||
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" GeneratePathProperty="true">
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.6" />
|
||||
<PackageReference Include="NameBasedGrid" Version="0.10.1">
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
</PackageReference>
|
||||
|
||||
@@ -202,6 +202,9 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
|
||||
case FeedReadResult.NotEnabled:
|
||||
case FeedReadResult.NotModified:
|
||||
|
||||
// Reset status to success
|
||||
LastReadResult = FeedReadResult.Success;
|
||||
|
||||
// Ignore
|
||||
break;
|
||||
|
||||
@@ -265,14 +268,20 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
|
||||
var clientHandler = new HttpClientHandler
|
||||
{
|
||||
// Set that we'll accept compressed data
|
||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
|
||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate | DecompressionMethods.Brotli,
|
||||
AllowAutoRedirect = true
|
||||
};
|
||||
|
||||
_httpClient = new HttpClient(clientHandler);
|
||||
_httpClient = new HttpClient(clientHandler)
|
||||
{
|
||||
// Set a timeout
|
||||
Timeout = TimeSpan.FromSeconds(10)
|
||||
};
|
||||
|
||||
// Set a timeout
|
||||
_httpClient.Timeout = TimeSpan.FromSeconds(10);
|
||||
_httpClient.DefaultRequestHeaders.Accept.ParseAdd("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
|
||||
_httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip, deflate, br");
|
||||
_httpClient.DefaultRequestHeaders.AcceptLanguage.ParseAdd("en-US,en;q=0.9");
|
||||
_httpClient.DefaultRequestHeaders.CacheControl = CacheControlHeaderValue.Parse("max-age=0");
|
||||
}
|
||||
|
||||
// Set a user agent string
|
||||
@@ -283,6 +292,8 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
|
||||
// If we need to authenticate then set the credentials
|
||||
_httpClient.DefaultRequestHeaders.Authorization = Authenticate ? new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"{Username}:{Password}"))) : null;
|
||||
|
||||
_httpClient.DefaultRequestHeaders.IfModifiedSince = LastChecked;
|
||||
|
||||
// Attempt to get the response
|
||||
var response = _httpClient.GetAsync(Source).Result;
|
||||
|
||||
@@ -313,6 +324,11 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
|
||||
}
|
||||
catch (HttpRequestException httpRequestException)
|
||||
{
|
||||
if (httpRequestException.StatusCode == HttpStatusCode.NotModified)
|
||||
{
|
||||
return Tuple.Create(FeedReadResult.NotModified, string.Empty);
|
||||
}
|
||||
|
||||
Log.Logger.Error(httpRequestException, "Exception");
|
||||
|
||||
return HandleHttpRequestException(httpRequestException);
|
||||
@@ -340,6 +356,9 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
|
||||
{
|
||||
switch (httpRequestException.StatusCode)
|
||||
{
|
||||
case HttpStatusCode.TooManyRequests:
|
||||
return Tuple.Create(FeedReadResult.TooManyRequests, string.Empty);
|
||||
|
||||
case HttpStatusCode.ServiceUnavailable:
|
||||
return Tuple.Create(FeedReadResult.TemporarilyUnavailable, string.Empty);
|
||||
|
||||
@@ -391,12 +410,12 @@ public partial class Feed : RealmObject, INotifyDataErrorInfo
|
||||
return FeedReadResult.NotDue;
|
||||
}
|
||||
|
||||
// We're checking it now so update the time
|
||||
LastChecked = DateTimeOffset.Now;
|
||||
|
||||
// Read the feed text
|
||||
var retrieveResult = RetrieveFeed();
|
||||
|
||||
// We're checking it now so update the time
|
||||
LastChecked = DateTimeOffset.Now;
|
||||
|
||||
// Get the information out of the async result
|
||||
var result = retrieveResult.Item1;
|
||||
var feedText = retrieveResult.Item2;
|
||||
|
||||
@@ -15,5 +15,6 @@ public enum FeedReadResult
|
||||
ConnectionFailed,
|
||||
ServerError,
|
||||
Moved,
|
||||
TemporarilyUnavailable
|
||||
TemporarilyUnavailable,
|
||||
TooManyRequests
|
||||
}
|
||||
@@ -24,17 +24,18 @@ public partial class MainWindow
|
||||
{
|
||||
StopTimer();
|
||||
|
||||
_mainTimer.Dispose();
|
||||
_mainTimer?.Dispose();
|
||||
_mainTimer = null;
|
||||
}
|
||||
|
||||
private void StartTimer()
|
||||
{
|
||||
_mainTimer.Start();
|
||||
_mainTimer?.Start();
|
||||
}
|
||||
|
||||
private void StopTimer()
|
||||
{
|
||||
_mainTimer.Stop();
|
||||
_mainTimer?.Stop();
|
||||
}
|
||||
|
||||
private void HandleMainTimerElapsed(object sender, EventArgs e)
|
||||
|
||||
@@ -166,6 +166,12 @@ public partial class MainWindow
|
||||
|
||||
// Delete the feed
|
||||
_database.SaveChanges(() => _database.Feeds.Remove(feedToDelete));
|
||||
|
||||
// Refresh the database to current settings
|
||||
ResetDatabase();
|
||||
|
||||
// Re-initialize the feed display
|
||||
DisplayFeed();
|
||||
}
|
||||
|
||||
private void OpenAllFeedItemsOnSinglePage()
|
||||
|
||||
@@ -49,14 +49,14 @@ public partial class MainWindow
|
||||
{
|
||||
// Set the last window location
|
||||
Settings.Default.WindowLocation = new Point(Left, Top);
|
||||
Settings.Default.Save();
|
||||
|
||||
// Set the last window size
|
||||
Settings.Default.WindowSize = new Size(Width, Height);
|
||||
Settings.Default.Save();
|
||||
|
||||
// Save the dock on the navigation tray
|
||||
Settings.Default.ToolbarLocation = NameBasedGrid.NameBasedGrid.GetRow(NavigationToolbarTray) == "TopToolbarRow" ? Dock.Top : Dock.Bottom;
|
||||
|
||||
// Save settings
|
||||
Settings.Default.Save();
|
||||
}
|
||||
|
||||
|
||||
18
Application/Properties/Resources.Designer.cs
generated
18
Application/Properties/Resources.Designer.cs
generated
@@ -840,6 +840,15 @@ namespace FeedCenter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Temporarily unavailable.
|
||||
/// </summary>
|
||||
public static string FeedReadResult_TemporarilyUnavailable {
|
||||
get {
|
||||
return ResourceManager.GetString("FeedReadResult_TemporarilyUnavailable", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Timeout.
|
||||
/// </summary>
|
||||
@@ -849,6 +858,15 @@ namespace FeedCenter.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Too many requests.
|
||||
/// </summary>
|
||||
public static string FeedReadResult_TooManyRequests {
|
||||
get {
|
||||
return ResourceManager.GetString("FeedReadResult_TooManyRequests", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Not authorized.
|
||||
/// </summary>
|
||||
|
||||
@@ -555,4 +555,10 @@ All feeds currently in category "{0}" will be moved to the default category.</va
|
||||
<data name="userAgentLabel" xml:space="preserve">
|
||||
<value>User agent</value>
|
||||
</data>
|
||||
<data name="FeedReadResult_TemporarilyUnavailable" xml:space="preserve">
|
||||
<value>Temporarily unavailable</value>
|
||||
</data>
|
||||
<data name="FeedReadResult_TooManyRequests" xml:space="preserve">
|
||||
<value>Too many requests</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -36,6 +36,9 @@ public static class SettingsStore
|
||||
// Try to get the setting from the database that matches the name and version
|
||||
var setting = entities.Settings.FirstOrDefault(s => s.Name == name);
|
||||
|
||||
if (setting?.Value == value)
|
||||
return;
|
||||
|
||||
entities.SaveChanges(() =>
|
||||
{
|
||||
// If there was no setting we need to create it
|
||||
|
||||
Reference in New Issue
Block a user