Improves Tumblr video detection

- Adds tumblr specific video regexes to the tumblr search and tumblr tag search crawler - Fixes tumblr '/video_file/' regex
johanneszab · Dec 8, 2018 · 1662200 · 1662200
1 parent 47e774e
commit 1662200
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 38 deletions.
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.64")]
-[assembly: AssemblyFileVersion("1.0.8.64")]
+[assembly: AssemblyVersion("1.0.8.65")]
+[assembly: AssemblyFileVersion("1.0.8.65")]
diff --git a/src/TumblThree/TumblThree.Applications/Crawler/AbstractTumblrCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/AbstractTumblrCrawler.cs
@@ -248,6 +248,19 @@ protected void AddTumblrVideoUrl(string post)
             }
         }
 
+        protected void AddInlineTumblrVideoUrl(string post, Regex regex)
+        {
+            foreach (Match match in regex.Matches(post))
+            {
+                string videoUrl = match.Groups[1].Value;
+
+                if (shellService.Settings.VideoSize == 480)
+                    videoUrl += "_480";
+
+                AddToDownloadList(new VideoPost(videoUrl + ".mp4", Guid.NewGuid().ToString("N")));
+            }
+        }
+
         protected void AddGenericPhotoUrl(string post)
         {
             foreach (string imageUrl in tumblrParser.SearchForGenericPhotoUrl(post))

diff --git a/src/TumblThree/TumblThree.Applications/Crawler/TumblrBlogCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/TumblrBlogCrawler.cs
@@ -464,8 +464,8 @@ private void AddVideoUrlToDownloadList(Post post)
 
             //var postCopy = (Post)post.Clone();
             AddInlineVideoUrl(post);
-            AddInlineTumblrVideoUrl(post, new Regex("\"(https?://ve.media.tumblr.com/(tumblr_[\\w]*))"));
-            AddInlineTumblrVideoUrl(post, new Regex("\"(https?://vtt.tumblr.com/(tumblr_[\\w]*))"));
+            AddInlineTumblrVideoUrl(InlineSearch(post), tumblrParser.GetTumblrVeVideoUrlRegex());
+            AddInlineTumblrVideoUrl(InlineSearch(post), tumblrParser.GetTumblrVttVideoUrlRegex());
             if (blog.RegExVideos)
                 AddGenericInlineVideoUrl(post);
 
@@ -602,18 +602,6 @@ private void AddInlineVideoUrl(Post post)
             AddTumblrVideoUrl(InlineSearch(post));
         }
 
-        private void AddInlineTumblrVideoUrl(Post post, Regex regex)
-        {
-            foreach (Match match in regex.Matches(InlineSearch(post)))
-            {
-                string videoUrl = match.Groups[1].Value;
-                if (shellService.Settings.VideoSize == 480)
-                    videoUrl += "_480";
-
-                AddToDownloadList(new VideoPost(videoUrl + ".mp4", Guid.NewGuid().ToString("N")));
-            }
-        }
-
         private void AddGenericInlineVideoUrl(Post post)
         {
             AddGenericVideoUrl(InlineSearch(post));

diff --git a/src/TumblThree/TumblThree.Applications/Crawler/TumblrHiddenCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/TumblrHiddenCrawler.cs
@@ -461,9 +461,9 @@ private void AddVideoUrlToDownloadList(Post post)
 
             //var videoUrls = new HashSet<string>();
 
-            AddInlineVideoUrl(postCopy);
-            AddInlineTumblrVideoUrl(postCopy, new Regex("\"(https?://ve.media.tumblr.com/(tumblr_[\\w]*))"));
-            AddInlineTumblrVideoUrl(postCopy, new Regex("\"(https?://vtt.tumblr.com/(tumblr_[\\w]*))"));
+            AddTumblrVideoUrl(InlineSearch(postCopy));
+            AddInlineTumblrVideoUrl(InlineSearch(postCopy), tumblrParser.GetTumblrVeVideoUrlRegex());
+            AddInlineTumblrVideoUrl(InlineSearch(postCopy), tumblrParser.GetTumblrVttVideoUrlRegex());
             if (blog.RegExVideos)
                 AddGenericInlineVideoUrl(postCopy);
 
@@ -490,24 +490,6 @@ private void AddVideoUrl(Post post)
             AddToJsonQueue(new TumblrCrawlerData<Post>(Path.ChangeExtension(videoUrl.Split('/').Last(), ".json"), post));
         }
 
-        private void AddInlineVideoUrl(Post post)
-        {
-            AddTumblrVideoUrl(InlineSearch(post));
-        }
-
-        private void AddInlineTumblrVideoUrl(Post post, Regex regex)
-        {
-            foreach (Match match in regex.Matches(InlineSearch(post)))
-            {
-                string videoUrl = match.Groups[1].Value;
-
-                if (shellService.Settings.VideoSize == 480)
-                    videoUrl += "_480";
-
-                AddToDownloadList(new VideoPost(videoUrl + ".mp4", Guid.NewGuid().ToString("N")));
-            }
-        }
-
         private void AddGenericInlineVideoUrl(Post post)
         {
             AddGenericVideoUrl(InlineSearch(post));

diff --git a/src/TumblThree/TumblThree.Applications/Crawler/TumblrSearchCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/TumblrSearchCrawler.cs
@@ -201,6 +201,8 @@ private void AddVideoUrlToDownloadList(string document)
             if (!blog.DownloadVideo)
                 return;
             AddTumblrVideoUrl(document);
+            AddInlineTumblrVideoUrl(document, tumblrParser.GetTumblrVeVideoUrlRegex());
+            AddInlineTumblrVideoUrl(document, tumblrParser.GetTumblrVttVideoUrlRegex());
 
             if (blog.RegExVideos)
                 AddGenericVideoUrl(document);

diff --git a/src/TumblThree/TumblThree.Applications/Crawler/TumblrTagSearchCrawler.cs b/src/TumblThree/TumblThree.Applications/Crawler/TumblrTagSearchCrawler.cs
@@ -238,6 +238,8 @@ private void AddVideoUrlToDownloadList(string document)
             if (!blog.DownloadVideo)
                 return;
             AddTumblrVideoUrl(document);
+            AddInlineTumblrVideoUrl(document, tumblrParser.GetTumblrVeVideoUrlRegex());
+            AddInlineTumblrVideoUrl(document, tumblrParser.GetTumblrVttVideoUrlRegex());
 
             if (blog.RegExVideos)
                 AddGenericVideoUrl(document);

diff --git a/src/TumblThree/TumblThree.Applications/Parser/TumblrParser.cs b/src/TumblThree/TumblThree.Applications/Parser/TumblrParser.cs
@@ -13,7 +13,7 @@ public class TumblrParser : ITumblrParser
 
         public Regex GetTumblrVttVideoUrlRegex() => new Regex("\"(https?://vtt.tumblr.com/(tumblr_[\\w]*))");
 
-        public Regex GetTumblrInlineVideoUrlRegex() => new Regex("\"(http[A-Za-z0-9_/:.]*.com/video_file/[A-Za-z0-9_/:.]*)\"");
+        public Regex GetTumblrInlineVideoUrlRegex() => new Regex("\"(http[A-Za-z0-9_/:.]*video_file[\\S]*/(tumblr_[\\w]*))[0-9/]*\"");
 
         public Regex GetGenericVideoUrlRegex() => new Regex("\"(https?://(?:[a-z0-9\\-]+\\.)+[a-z]{2,6}(?:/[^/#?]+)+\\.(?:mp4|mkv|gifv))\"");