Notify user if post couldn't be parsed

- Notifies the user if a post couldn't be parsed and was discarded.
johanneszab · Mar 23, 2018 · 46871f2 · 46871f2
1 parent 300d8cd
commit 46871f2
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 13 deletions.
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
diff --git a/LICENSE-3RD-PARTY.txt → LICENSE-3RD-PARTY b/LICENSE-3RD-PARTY.txt → LICENSE-3RD-PARTY
diff --git a/src/TumblThree/SharedAssemblyInfo.cs b/src/TumblThree/SharedAssemblyInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)]
-[assembly: AssemblyVersion("1.0.8.45")]
-[assembly: AssemblyFileVersion("1.0.8.45")]
+[assembly: AssemblyVersion("1.0.8.46")]
+[assembly: AssemblyFileVersion("1.0.8.46")]
diff --git a/src/TumblThree/TumblThree.Applications/Crawler/AbstractCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/AbstractCrawler.cs
@@ -10,7 +10,6 @@
 using System.Web;
 using TumblThree.Applications.DataModels;
 using TumblThree.Applications.DataModels.TumblrPosts;
-using TumblThree.Applications.Downloader;
 using TumblThree.Applications.Extensions;
 using TumblThree.Applications.Properties;
 using TumblThree.Applications.Services;
@@ -149,15 +148,17 @@ protected void AddToDownloadList(TumblrPost addToList)
             statisticsBag.Add(addToList);
         }
 
-        public static T ConvertJsonToClass<T>(string json) where T : new()
+        public T ConvertJsonToClass<T>(string json) where T : new()
         {
             try
             {
                 var serializer = new System.Web.Script.Serialization.JavaScriptSerializer();
                 return serializer.Deserialize<T>(json);
             }
-            catch (InvalidOperationException)
+            catch (InvalidOperationException invalidOperationException)
             {
+                Logger.Error("AbstractCrawler:ConvertJsonToClass<T>: {0}", "Could not parse data");
+                shellService.ShowError(invalidOperationException, Resources.PostNotParsable, blog.Name);
                 return new T();
             }
         }

diff --git a/src/TumblThree/TumblThree.Applications/Crawler/TumblrBlogCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/TumblrBlogCrawler.cs
@@ -135,7 +135,7 @@ private async Task UpdateMetaInformation()
             }
         }
 
-        public new static T ConvertJsonToClass<T>(string json) where T : new()
+        public new T ConvertJsonToClass<T>(string json) where T : new()
         {
             try
             {
@@ -145,8 +145,10 @@ private async Task UpdateMetaInformation()
                     return (T)serializer.ReadObject(ms);
                 }
             }
-            catch (System.Runtime.Serialization.SerializationException)
+            catch (System.Runtime.Serialization.SerializationException serializationException)
             {
+                Logger.Error("TumblrBlogCrawler:ConvertJsonToClass<T>: {0}", "Could not parse data");
+                shellService.ShowError(serializationException, Resources.PostNotParsable, blog.Name);
                 return new T();
             }
         }

diff --git a/src/TumblThree/TumblThree.Applications/Crawler/TumblrHiddenCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/TumblrHiddenCrawler.cs
@@ -144,7 +144,7 @@ public override async Task UpdateMetaInformationAsync()
             }
         }
 
-        public new static T ConvertJsonToClass<T>(string json) where T : new()
+        public new T ConvertJsonToClass<T>(string json) where T : new()
         {
             try
             {
@@ -154,8 +154,10 @@ public override async Task UpdateMetaInformationAsync()
                     return (T)serializer.ReadObject(ms);
                 }
             }
-            catch (System.Runtime.Serialization.SerializationException)
+            catch (System.Runtime.Serialization.SerializationException serializationException)
             {
+                Logger.Error("TumblrHiddenCrawler:ConvertJsonToClass<T>: {0}", "Could not parse data");
+                shellService.ShowError(serializationException, Resources.PostNotParsable, blog.Name);
                 return new T();
             }
         }

diff --git a/src/TumblThree/TumblThree.Applications/DataModels/TumblrSvcJson.cs b/src/TumblThree/TumblThree.Applications/DataModels/TumblrSvcJson.cs
@@ -36,6 +36,14 @@ public class Meta
     [DataContract]
     public class Theme
     {
+        [DataMember(EmitDefaultValue = false)]
+        public int header_full_width { get; set; }
+        [DataMember(EmitDefaultValue = false)]
+        public int header_full_height { get; set; }
+        [DataMember(EmitDefaultValue = false)]
+        public int header_focus_width { get; set; }
+        [DataMember(EmitDefaultValue = false)]
+        public int header_focus_height { get; set; }
         [DataMember(EmitDefaultValue = false)]
         public string avatar_shape { get; set; }
         [DataMember(EmitDefaultValue = false)]
@@ -354,6 +362,8 @@ public class Post : ICloneable
         [DataMember(EmitDefaultValue = false)]
         public bool is_nsfw_based_on_score { get; set; }
         [DataMember(EmitDefaultValue = false)]
+        public List<string> supply_logging { get; set; }
+        [DataMember(EmitDefaultValue = false)]
         public Blog blog { get; set; }
         [DataMember(EmitDefaultValue = false)]
         public bool is_nsfw { get; set; }
@@ -384,6 +394,8 @@ public class Post : ICloneable
         [DataMember(EmitDefaultValue = false)]
         public string summary { get; set; }
         [DataMember(EmitDefaultValue = false)]
+        public bool is_blocks_post_format { get; set; }
+        [DataMember(EmitDefaultValue = false)]
         public string recommended_source { get; set; }
         [DataMember(EmitDefaultValue = false)]
         public string recommended_color { get; set; }
@@ -535,6 +547,10 @@ public class Post : ICloneable
         public bool? is_anonymous { get; set; }
         [DataMember(EmitDefaultValue = false)]
         public bool? is_submission { get; set; }
+        [DataMember(EmitDefaultValue = false)]
+        public bool should_bypass_tagfiltering { get; set; }
+        [DataMember(EmitDefaultValue = false)]
+        public string provider_uri { get; set; }
 
         public object Clone()
         {
@@ -551,6 +567,7 @@ private void Initialize()
         {
             type = string.Empty;
             is_nsfw_based_on_score = false;
+            supply_logging = new List<string>();
             blog = new Blog();
             is_nsfw = false;
             nsfw_score = 0.0;

diff --git a/src/TumblThree/TumblThree.Applications/Properties/AppSettings.cs b/src/TumblThree/TumblThree.Applications/Properties/AppSettings.cs
@@ -351,7 +351,7 @@ private void Initialize()
             ConcurrentBlogs = 1;
             ConcurrentScans = 4;
             LimitScanBandwidth = false;
-            TimeOut = 30;
+            TimeOut = 60;
             LimitConnections = true;
             MaxConnections = 90;
             ConnectionTimeInterval = 60;

diff --git a/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs b/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs
diff --git a/src/TumblThree/TumblThree.Applications/Properties/Resources.resx b/src/TumblThree/TumblThree.Applications/Properties/Resources.resx
@@ -287,6 +287,9 @@
   <data name="PostId" xml:space="preserve">
     <value>Post ID: {0}</value>
   </data>
+  <data name="PostNotParsable" xml:space="preserve">
+    <value>A post from {0} was not parsable. Setting 'posts per page' to 1 in the Details might increase the downloadable content.</value>
+  </data>
   <data name="ProgressDownloadImage" xml:space="preserve">
     <value>Downloading {0}.</value>
   </data>

diff --git a/src/TumblThree/TumblThree.Applications/ViewModels/SettingsViewModel.cs b/src/TumblThree/TumblThree.Applications/ViewModels/SettingsViewModel.cs
@@ -816,7 +816,7 @@ private void LoadSettings()
                 ConcurrentBlogs = 1;
                 ConcurrentScans = 4;
                 LimitScanBandwidth = false;
-                TimeOut = 30;
+                TimeOut = 60;
                 LimitConnections = true;
                 MaxConnections = 90;
                 ConnectionTimeInterval = 60;

diff --git a/src/TumblThree/TumblThree.Presentation/Views/AboutView.xaml b/src/TumblThree/TumblThree.Presentation/Views/AboutView.xaml
@@ -49,7 +49,7 @@
                 <Label Content="{x:Static p:Resources.License}" Grid.Row="2" />
                 <Label Grid.Column="1" Grid.Row="2">
                     <Hyperlink Command="{Binding ShowWebsiteCommand}"
-                               CommandParameter="https://github.com/johanneszab/TumblThree/blob/master/LICENSE.txt">
+                               CommandParameter="https://github.com/johanneszab/TumblThree/blob/master/LICENSE">
                         The
                         MIT License (MIT)
                     </Hyperlink>
@@ -66,7 +66,7 @@
                 <Label Content="{x:Static p:Resources.ThirdPartySoftware}" Grid.Row="4" />
                 <Label Grid.Column="1" Grid.Row="4">
                     <Hyperlink Command="{Binding ShowWebsiteCommand}"
-                               CommandParameter="https://github.com/johanneszab/TumblThree/blob/master/LICENSE-3RD-PARTY.txt">
+                               CommandParameter="https://github.com/johanneszab/TumblThree/blob/master/LICENSE-3RD-PARTY">
                         Third-party
                         Software and Licenses
                     </Hyperlink>