Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions GalnetMonitor/GalnetMonitor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Xml;
using System.Net.Http;
using Utilities;

namespace EddiGalnetMonitor
Expand Down Expand Up @@ -223,16 +224,23 @@ private static List<FeedItem> GetFeedItems ( string url, bool fromAltUrl = false
var items = new List<FeedItem>();
try
{
using ( var reader = XmlReader.Create( url ) )
using ( var httpClient = new HttpClient() )
{
var feed = SyndicationFeed.Load( reader );
var normalizer = new GalnetFeedItemNormalizer( fromAltUrl );
foreach ( var syndicationItem in feed.Items )
// Add a User-Agent header (required by many servers)
httpClient.DefaultRequestHeaders.Add( "User-Agent", "EDDI/5.0 (Compatible)" );

using ( var stream = httpClient.GetStreamAsync( url ).GetAwaiter().GetResult() )
using ( var reader = XmlReader.Create( stream ) )
{
var feedItem = normalizer.Normalize( feed, syndicationItem );
if ( feedItem != null )
var feed = SyndicationFeed.Load( reader );
var normalizer = new GalnetFeedItemNormalizer( fromAltUrl );
foreach ( var syndicationItem in feed.Items )
{
items.Add( feedItem );
var feedItem = normalizer.Normalize( feed, syndicationItem );
if ( feedItem != null )
{
items.Add( feedItem );
}
}
}
}
Expand Down
Loading