Commit: 7c7194111f16802edbf190ee0cd3466b5b3d59be - open_tween (git)

dev

Commit MetaInfo

• Revision: 7c7194111f16802edbf190ee0cd3466b5b3d59be (tree)
• Time: 2014-01-13 07:46:42
• Author: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Log Message

Pixivサムネイル取得処理の改善

Change Summary

• modified: OpenTween/MyCommon.cs
• modified: OpenTween/Thumbnail/Services/Pixiv.cs
• modified: OpenTween/Thumbnail/ThumbnailGenerator.cs

Incremental Difference

--- a/OpenTween/MyCommon.cs
+++ b/OpenTween/MyCommon.cs
@@ -744,13 +744,17 @@ namespace OpenTween
 
         public static string fileVersion = "";
 
-        public static string GetUserAgentString()
+        public static string GetUserAgentString(bool fakeMSIE = false)
         {
             if (string.IsNullOrEmpty(fileVersion))
             {
                 throw new Exception("fileversion is not Initialized.");
             }
-            return GetAssemblyName() + "/" + fileVersion;
+
+            if (fakeMSIE)
+                return GetAssemblyName() + "/" + fileVersion + " (compatible; MSIE 10.0)";
+            else
+                return GetAssemblyName() + "/" + fileVersion;
         }
 
         public static TwitterApiStatus TwitterApiInfo = new TwitterApiStatus();

--- a/OpenTween/Thumbnail/Services/Pixiv.cs
+++ b/OpenTween/Thumbnail/Services/Pixiv.cs
@@ -22,8 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace OpenTween.Thumbnail.Services
 {
@@ -34,12 +36,36 @@ namespace OpenTween.Thumbnail.Services
         {
         }
 
-        protected override string FetchImageUrl(string url)
+        public override ThumbnailInfo GetThumbnailInfo(string url, PostClass post)
         {
-            var thumbnailUrl = base.FetchImageUrl(url);
+            var thumb = base.GetThumbnailInfo(url, post);
+            if (thumb == null) return null;
 
-            // og:image のサムネイルURLにそのままアクセスすると403が返ってくるので回避
-            return Regex.Replace(thumbnailUrl, @"_s(?=\..{3}$)", "_m");
+            return new Pixiv.Thumbnail
+            {
+                ImageUrl = thumb.ImageUrl,
+                ThumbnailUrl = thumb.ThumbnailUrl,
+                TooltipText = thumb.TooltipText,
+                FullSizeImageUrl = thumb.FullSizeImageUrl,
+            };
+        }
+
+        public class Thumbnail : ThumbnailInfo
+        {
+            protected override Task<MemoryImage> LoadThumbnailImageAsync()
+            {
+                var client = new OTWebClient();
+
+                client.UserAgent = MyCommon.GetUserAgentString(fakeMSIE: true);
+                client.Headers[HttpRequestHeader.Referer] = this.ImageUrl;
+
+                var task = client.DownloadDataAsync(new Uri(this.ThumbnailUrl))
+                    .ContinueWith(t => MemoryImage.CopyFromBytes(t.Result));
+
+                task.ContinueWith(_ => client.Dispose());
+
+                return task;
+            }
         }
     }
 }

--- a/OpenTween/Thumbnail/ThumbnailGenerator.cs
+++ b/OpenTween/Thumbnail/ThumbnailGenerator.cs
@@ -118,7 +118,7 @@ namespace OpenTween.Thumbnail
                     "http://lohas.nicoseiga.jp/thumb/${id}l?"),
 
                 // pixiv
-                new MetaThumbnailService(@"^http://www\.pixiv\.net/(member_illust|index)\.php\?(?=.*mode=(medium|big))(?=.*illust_id=(?<illustId>[0-9]+)).*$"),
+                new Pixiv(@"^http://www\.pixiv\.net/(member_illust|index)\.php\?(?=.*mode=(medium|big))(?=.*illust_id=(?<illustId>[0-9]+)).*$"),
 
                 // flickr
                 new MetaThumbnailService(@"^http://www\.flickr\.com/.+$"),