Commit: cdb63e40b6a0a85cfbe9e9044b19572519509a15 - opentween (git)

開発に使用するリポジトリ

Commit MetaInfo

• Revisión: cdb63e40b6a0a85cfbe9e9044b19572519509a15 (tree)
• Tiempo: 2012-12-22 01:01:52
• Autor: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Log Message

OpenTween.Thumbnail.Services.* のテストをいくつか追加

Cambiar Resumen

• modified: OpenTween.Tests/OpenTween.Tests.csproj
• add: OpenTween.Tests/Thumbnail/Services/ImgAzyobuziNetTest.cs
• add: OpenTween.Tests/Thumbnail/Services/MetaThumbnailServiceTest.cs
• add: OpenTween.Tests/Thumbnail/Services/SimpleThumbnailServiceTest.cs
• add: OpenTween.Tests/Thumbnail/Services/TinamiTest.cs
• modified: OpenTween/Thumbnail/Services/ImgAzyobuziNet.cs
• modified: OpenTween/Thumbnail/Services/MetaThumbnailService.cs
• modified: OpenTween/Thumbnail/Services/Pixiv.cs
• modified: OpenTween/Thumbnail/Services/SimpleThumbnailService.cs
• modified: OpenTween/Thumbnail/Services/Tinami.cs
• modified: OpenTween/Thumbnail/ThumbnailGenerator.cs

Diferencia incremental

--- a/OpenTween.Tests/OpenTween.Tests.csproj
+++ b/OpenTween.Tests/OpenTween.Tests.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{18A32642-A8F3-425B-978D-0C6F630EDDE8}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenTween.Tests</RootNamespace>
+    <RootNamespace>OpenTween</RootNamespace>
     <AssemblyName>OpenTween.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -58,6 +58,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TabsDialogTest.cs" />
     <Compile Include="TestUtils.cs" />
+    <Compile Include="Thumbnail\Services\ImgAzyobuziNetTest.cs" />
+    <Compile Include="Thumbnail\Services\MetaThumbnailServiceTest.cs" />
+    <Compile Include="Thumbnail\Services\SimpleThumbnailServiceTest.cs" />
+    <Compile Include="Thumbnail\Services\TinamiTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenTween\OpenTween.csproj">

--- /dev/null
+++ b/OpenTween.Tests/Thumbnail/Services/ImgAzyobuziNetTest.cs
@@ -0,0 +1,62 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2012 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+// 
+// This file is part of OpenTween.
+// 
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+// 
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details. 
+// 
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+namespace OpenTween.Thumbnail.Services
+{
+    [TestFixture]
+    class ImgAzyobuziNetTest
+    {
+        class TestImgAzyobuziNet : ImgAzyobuziNet
+        {
+            protected override byte[] FetchRegex(string apiBase)
+            {
+                return Encoding.UTF8.GetBytes("[{\"name\": \"hogehoge\", \"regex\": \"^https?://example.com/(.+)$\"}]");
+            }
+        }
+
+        [Test]
+        public void MatchTest()
+        {
+            var service = new TestImgAzyobuziNet();
+            var thumbinfo = service.GetThumbnailInfo("http://example.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Not.Null);
+            Assert.That(thumbinfo.ImageUrl, Is.EqualTo("http://example.com/abcd"));
+            Assert.That(thumbinfo.ThumbnailUrl, Is.EqualTo("http://img.azyobuzi.net/api/redirect?uri=http%3A%2F%2Fexample.com%2Fabcd"));
+            Assert.That(thumbinfo.TooltipText, Is.Null);
+        }
+
+        [Test]
+        public void NotMatchTest()
+        {
+            var service = new TestImgAzyobuziNet();
+            var thumbinfo = service.GetThumbnailInfo("http://hogehoge.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Null);
+        }
+    }
+}

--- /dev/null
+++ b/OpenTween.Tests/Thumbnail/Services/MetaThumbnailServiceTest.cs
@@ -0,0 +1,139 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2012 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+// 
+// This file is part of OpenTween.
+// 
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+// 
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details. 
+// 
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+namespace OpenTween.Thumbnail.Services
+{
+    [TestFixture]
+    class MetaThumbnailServiceTest
+    {
+        class TestMetaThumbnailService : MetaThumbnailService
+        {
+            public string FakeHtml { get; set; }
+
+            public TestMetaThumbnailService(string url)
+                : base(url)
+            {
+            }
+
+            protected override string FetchImageUrl(string url)
+            {
+                return this.FakeHtml;
+            }
+        }
+
+        [Test]
+        [Description("Open Graph protocol")]
+        public void OGPMetaTest()
+        {
+            var service = new TestMetaThumbnailService(@"http://example.com/.+");
+
+            service.FakeHtml = @"
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML+RDFa 1.0//EN' 'http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd'>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+  <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
+  <meta property='og:image' content='http://img.example.com/abcd'/>
+  <title>hogehoge</title>
+</head>
+<body>
+  <p>hogehoge</p>
+</body>
+</html>
+";
+            var thumbinfo = service.GetThumbnailInfo("http://example.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Not.Null);
+            Assert.That(thumbinfo.ImageUrl, Is.EqualTo("http://example.com/abcd"));
+            Assert.That(thumbinfo.ThumbnailUrl, Is.EqualTo("http://img.example.com/abcd"));
+            Assert.That(thumbinfo.TooltipText, Is.Null);
+        }
+
+        [Test]
+        [Description("Twitter Cards")]
+        public void TwitterMetaTest()
+        {
+            var service = new TestMetaThumbnailService(@"http://example.com/.+");
+
+            service.FakeHtml = @"
+<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>
+
+<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+<meta name='twitter:image' content='http://img.example.com/abcd'>
+<title>hogehoge</title>
+
+<p>hogehoge
+";
+            var thumbinfo = service.GetThumbnailInfo("http://example.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Not.Null);
+            Assert.That(thumbinfo.ImageUrl, Is.EqualTo("http://example.com/abcd"));
+            Assert.That(thumbinfo.ThumbnailUrl, Is.EqualTo("http://img.example.com/abcd"));
+            Assert.That(thumbinfo.TooltipText, Is.Null);
+        }
+
+        [Test]
+        [Description("Twitpicとか")]
+        public void InvalidMetaTest()
+        {
+            var service = new TestMetaThumbnailService(@"http://example.com/.+");
+
+            service.FakeHtml = @"
+<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>
+
+<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+<meta name='twitter:image' value='http://img.example.com/abcd'>
+<title>hogehoge</title>
+
+<p>hogehoge
+";
+            var thumbinfo = service.GetThumbnailInfo("http://example.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Not.Null);
+            Assert.That(thumbinfo.ImageUrl, Is.EqualTo("http://example.com/abcd"));
+            Assert.That(thumbinfo.ThumbnailUrl, Is.EqualTo("http://img.example.com/abcd"));
+            Assert.That(thumbinfo.TooltipText, Is.Null);
+        }
+
+        [Test]
+        public void NoMetaTest()
+        {
+            var service = new TestMetaThumbnailService(@"http://example.com/.+");
+
+            service.FakeHtml = @"
+<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>
+
+<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+<title>hogehoge</title>
+
+<p>hogehoge
+";
+            var thumbinfo = service.GetThumbnailInfo("http://example.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Null);
+        }
+    }
+}

--- /dev/null
+++ b/OpenTween.Tests/Thumbnail/Services/SimpleThumbnailServiceTest.cs
@@ -0,0 +1,56 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2012 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+// 
+// This file is part of OpenTween.
+// 
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+// 
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details. 
+// 
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+namespace OpenTween.Thumbnail.Services
+{
+    [TestFixture]
+    class SimpleThumbnailServiceTest
+    {
+        [Test]
+        public void RegexMatchTest()
+        {
+            var service = new SimpleThumbnailService(@"http://example.com/(.+)", @"http://img.example.com/$1");
+
+            var thumbinfo = service.GetThumbnailInfo("http://example.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Not.Null);
+            Assert.That(thumbinfo.ImageUrl, Is.EqualTo("http://example.com/abcd"));
+            Assert.That(thumbinfo.ThumbnailUrl, Is.EqualTo("http://img.example.com/abcd"));
+            Assert.That(thumbinfo.TooltipText, Is.Null);
+        }
+
+        [Test]
+        public void RegexNotMatchTest()
+        {
+            var service = new SimpleThumbnailService(@"http://example.com/(.+)", @"http://img.example.com/\1");
+
+            var thumbinfo = service.GetThumbnailInfo("http://hogehoge.com/abcd", null);
+
+            Assert.That(thumbinfo, Is.Null);
+        }
+    }
+}

--- /dev/null
+++ b/OpenTween.Tests/Thumbnail/Services/TinamiTest.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml.Linq;
+
+namespace OpenTween.Thumbnail.Services
+{
+    [TestFixture]
+    class TinamiTest
+    {
+        class TestTinami : Tinami
+        {
+            public string FakeXml { get; set; }
+
+            public TestTinami(string pattern, string replacement)
+                : base(pattern, replacement)
+            {
+            }
+
+            protected override XDocument FetchContentInfoApi(string url)
+            {
+                Assert.That(url, Is.StringMatching(@"http://api\.tinami\.com/content/info\?cont_id=.+&api_key=.+"));
+
+                return XDocument.Parse(this.FakeXml);
+            }
+        }
+
+        [Test]
+        public void ApiTest()
+        {
+            var service = new TestTinami(@"^http://www\.tinami\.com/view/(?<ContentId>\d+)$",
+                "http://api.tinami.com/content/info?cont_id=${ContentId}&api_key=" + ApplicationSettings.TINAMIApiKey);
+
+            service.FakeXml = @"<?xml version='1.0' encoding='utf-8' ?>
+<rsp stat='ok'>
+  <content type='illust' issupport='1' iscollection='0'>
+    <title>ほげほげ</title>
+    <description>説明</description>
+    <thumbnails>
+      <thumbnail_150x150 url='http://img.tinami.com/hogehoge_150.gif' width='112' height='120'/>
+    </thumbnails>
+    <image>
+      <url>http://img.tinami.com/hogehoge_full.gif</url>
+      <width>640</width>
+      <height>480</height>
+    </image>
+  </content>
+</rsp>";
+            var thumbinfo = service.GetThumbnailInfo("http://www.tinami.com/view/12345", null);
+
+            Assert.That(thumbinfo, Is.Not.Null);
+            Assert.That(thumbinfo.ImageUrl, Is.EqualTo("http://www.tinami.com/view/12345"));
+            Assert.That(thumbinfo.ThumbnailUrl, Is.EqualTo("http://img.tinami.com/hogehoge_150.gif"));
+            Assert.That(thumbinfo.TooltipText, Is.EqualTo("説明"));
+        }
+    }
+}

--- a/OpenTween/Thumbnail/Services/ImgAzyobuziNet.cs
+++ b/OpenTween/Thumbnail/Services/ImgAzyobuziNet.cs
@@ -44,10 +44,16 @@ namespace OpenTween.Thumbnail.Services
 
         private object LockObj = new object();
 
-        public ImgAzyobuziNet()
+        public ImgAzyobuziNet(bool autoupdate = false)
         {
             this.LoadRegex();
 
+            if (autoupdate)
+                this.StartAutoUpdate();
+        }
+
+        public void StartAutoUpdate()
+        {
             Task.Factory.StartNew(() =>
             {
                 for (;;)
@@ -80,8 +86,7 @@ namespace OpenTween.Thumbnail.Services
         {
             try
             {
-                using (var client = new OTWebClient() { Timeout = 1000 })
-                using (var jsonReader = JsonReaderWriterFactory.CreateJsonReader(client.DownloadData(apiBase + "regex.json"), XmlDictionaryReaderQuotas.Max))
+                using (var jsonReader = JsonReaderWriterFactory.CreateJsonReader(this.FetchRegex(apiBase), XmlDictionaryReaderQuotas.Max))
                 {
                     var xElm = XElement.Load(jsonReader);
 
@@ -102,6 +107,14 @@ namespace OpenTween.Thumbnail.Services
             return false;
         }
 
+        protected virtual byte[] FetchRegex(string apiBase)
+        {
+            using (var client = new OTWebClient() { Timeout = 1000 })
+            {
+                return client.DownloadData(apiBase + "regex.json");
+            }
+        }
+
         public override ThumbnailInfo GetThumbnailInfo(string url, PostClass post)
         {
             lock (this.LockObj)

--- a/OpenTween/Thumbnail/Services/MetaThumbnailService.cs
+++ b/OpenTween/Thumbnail/Services/MetaThumbnailService.cs
@@ -36,7 +36,12 @@ namespace OpenTween.Thumbnail.Services
         protected static Regex metaPattern = new Regex("<meta property=[\"'](?<property>.+?)[\"'] content=[\"'](?<content>.+?)[\"']");
         protected static string[] propertyNames = { "twitter:image", "og:image" };
 
-        public MetaThumbnailService(string pattern, string replacement = "${0}")
+        public MetaThumbnailService(string url)
+            : base(url, "${0}")
+        {
+        }
+
+        public MetaThumbnailService(string pattern, string replacement)
             : base(pattern, replacement)
         {
         }
@@ -46,7 +51,9 @@ namespace OpenTween.Thumbnail.Services
             var pageUrl = this.ReplaceUrl(url);
             if (pageUrl == null) return null;
 
-            var thumbnailUrl = this.FetchThumbnailUrl(pageUrl);
+            var content = this.FetchImageUrl(pageUrl);
+
+            var thumbnailUrl = this.GetThumbnailUrl(content);
             if (string.IsNullOrEmpty(thumbnailUrl)) return null;
 
             return new ThumbnailInfo()
@@ -57,23 +64,27 @@ namespace OpenTween.Thumbnail.Services
             };
         }
 
-        protected virtual string FetchThumbnailUrl(string url)
+        protected virtual string GetThumbnailUrl(string html)
         {
-            using (var client = new OTWebClient())
-            {
-                var content = client.DownloadString(url);
-                var matches = MetaThumbnailService.metaPattern.Matches(content);
+            var matches = MetaThumbnailService.metaPattern.Matches(html);
 
-                foreach (Match match in matches)
+            foreach (Match match in matches)
+            {
+                var propertyName = match.Groups["property"].Value;
+                if (MetaThumbnailService.propertyNames.Contains(propertyName))
                 {
-                    var propertyName = match.Groups["property"].Value;
-                    if (MetaThumbnailService.propertyNames.Contains(propertyName))
-                    {
-                        return match.Groups["content"].Value;
-                    }
+                    return match.Groups["content"].Value;
                 }
+            }
+
+            return null;
+        }
 
-                return null;
+        protected virtual string FetchImageUrl(string url)
+        {
+            using (var client = new OTWebClient())
+            {
+                return client.DownloadString(url);
             }
         }
     }

--- a/OpenTween/Thumbnail/Services/Pixiv.cs
+++ b/OpenTween/Thumbnail/Services/Pixiv.cs
@@ -34,9 +34,9 @@ namespace OpenTween.Thumbnail.Services
         {
         }
 
-        protected override string FetchThumbnailUrl(string url)
+        protected override string FetchImageUrl(string url)
         {
-            var thumbnailUrl = base.FetchThumbnailUrl(url);
+            var thumbnailUrl = base.FetchImageUrl(url);
 
             // og:image のサムネイルURLにそのままアクセスすると403が返ってくるので回避
             return Regex.Replace(thumbnailUrl, @"_s(?=\..{3}$)", "_m");

--- a/OpenTween/Thumbnail/Services/SimpleThumbnailService.cs
+++ b/OpenTween/Thumbnail/Services/SimpleThumbnailService.cs
@@ -28,7 +28,7 @@ using System.Text.RegularExpressions;
 namespace OpenTween.Thumbnail.Services
 {
     /// <summary>
-    /// 正規表現による単純な置換でサムネイルURLを生成する
+    /// 正規表現によるURLの単純な置換でサムネイルURLを生成する
     /// </summary>
     class SimpleThumbnailService : IThumbnailService
     {

--- a/OpenTween/Thumbnail/Services/Tinami.cs
+++ b/OpenTween/Thumbnail/Services/Tinami.cs
@@ -43,7 +43,7 @@ namespace OpenTween.Thumbnail.Services
             var apiUrl = base.ReplaceUrl(url);
             if (apiUrl == null) return null;
 
-            var xdoc = XDocument.Load(apiUrl);
+            var xdoc = this.FetchContentInfoApi(apiUrl);
 
             if (xdoc.XPathSelectElement("/rsp").Attribute("stat").Value == "ok")
             {
@@ -63,5 +63,10 @@ namespace OpenTween.Thumbnail.Services
 
             return null;
         }
+
+        protected virtual XDocument FetchContentInfoApi(string url)
+        {
+            return XDocument.Load(url);
+        }
     }
 }

--- a/OpenTween/Thumbnail/ThumbnailGenerator.cs
+++ b/OpenTween/Thumbnail/ThumbnailGenerator.cs
@@ -40,7 +40,7 @@ namespace OpenTween.Thumbnail
                 new SimpleThumbnailService(@"^https?://.*(\.jpg|\.jpeg|\.gif|\.png|\.bmp)$", "${0}"),
 
                 // img.azyobuzi.net
-                new ImgAzyobuziNet(),
+                new ImgAzyobuziNet(autoupdate: true),
 
                 // ImgUr
                 new SimpleThumbnailService(@"^http://(?:i\.)?imgur\.com/(\w+)(?:\..{3})?$", "http://img.imgur.com/${1}l.jpg"),