Commit: d1ef3ad260e41a13b32cd276d10cf5caadf5cd7a - opentween (git)

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

Commit MetaInfo

• Révision: d1ef3ad260e41a13b32cd276d10cf5caadf5cd7a (tree)
• l'heure: 2013-06-13 20:07:06
• Auteur: ANIKITI <anikiti07@gmai...>
• Commiter: ANIKITI

Message de Log

画像アップロード対応サービスについっぷるフォトを追加

Change Summary

• add: OpenTween/Connection/TwipplePhoto.cs
• modified: OpenTween/OpenTween.csproj
• modified: OpenTween/Resources/ChangeLog.txt
• modified: OpenTween/Tween.cs

Modification

--- /dev/null
+++ b/OpenTween/Connection/TwipplePhoto.cs
@@ -0,0 +1,185 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2013 ANIKITI (@anikiti07) <https://twitter.com/anikiti07>
+// 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.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Xml;
+
+namespace OpenTween.Connection
+{
+    public sealed class TwipplePhoto : HttpConnectionOAuthEcho,
+                                       IMultimediaShareService
+    {
+        private const string TwipplePhotoUploadEndpointV2 = "http://p.twipple.jp/api/upload2";
+        private const long MaxFileSize = 4 * 1024 * 1024;
+
+        private readonly Twitter _twitter;
+        private readonly IEnumerable<string> _pictureExtensions = new[]
+        {
+            ".gif",
+            ".jpg",
+            ".png"
+        };
+
+        #region Constructors
+
+        public TwipplePhoto(Twitter twitter)
+            : base(new Uri("http://api.twitter.com/"), new Uri("https://api.twitter.com/1.1/account/verify_credentials.json"))
+        {
+            if (twitter == null)
+                throw new ArgumentNullException("twitter");
+
+            _twitter = twitter;
+            Initialize(ApplicationSettings.TwitterConsumerKey, ApplicationSettings.TwitterConsumerSecret,
+                       _twitter.AccessToken, _twitter.AccessTokenSecret,
+                       "", "");
+        }
+
+        #endregion
+
+        #region IMultimediaShareService Members
+
+        #region Upload Methods
+
+        public string Upload(ref string filePath, ref string message, long reply_to)
+        {
+            if (!File.Exists(filePath))
+                return "Err:File isn't exists.";
+
+            var mediaFile = new FileInfo(filePath);
+            var content = "";
+            HttpStatusCode result;
+            try
+            {
+                result = UploadFile(mediaFile, ref content);
+            }
+            catch (Exception ex)
+            {
+                return "Err:" + ex.Message;
+            }
+
+            var imageUrl = "";
+            if (result == HttpStatusCode.OK)
+            {
+                try
+                {
+                    var xdoc = new XmlDocument();
+                    xdoc.LoadXml(content);
+                    var urlNode = xdoc.SelectSingleNode("/rsp/mediaurl");
+                    if (urlNode != null)
+                    {
+                        imageUrl = urlNode.InnerText;
+                    }
+                }
+                catch (XmlException ex)
+                {
+                    return "XmlErr:" + ex.Message;
+                }
+            }
+            else
+            {
+                return "Err:" + result;
+            }
+
+            filePath = "";
+            if (message == null)
+                message = "";
+
+            // Post to twitter
+            if (message.Length + AppendSettingDialog.Instance.TwitterConfiguration.CharactersReservedPerMedia + 1 > 140)
+            {
+                message = message.Substring(0, 140 - AppendSettingDialog.Instance.TwitterConfiguration.CharactersReservedPerMedia - 1) + " " + imageUrl;
+            }
+            else
+            {
+                message += " " + imageUrl;
+            }
+            return _twitter.PostStatus(message, reply_to);
+        }
+
+        private HttpStatusCode UploadFile(FileInfo mediaFile, ref string content)
+        {
+            if (!CheckValidExtension(mediaFile.Extension))
+                throw new ArgumentException("Service don't support this filetype", "mediaFile");
+            if (!CheckValidFilesize(mediaFile.Extension, mediaFile.Length))
+                throw new ArgumentException("File is too large", "mediaFile");
+
+            var binaly = new List<KeyValuePair<string, FileInfo>>
+            {
+                new KeyValuePair<string, FileInfo>("media", mediaFile)
+            };
+            InstanceTimeout = 60000;
+
+            return GetContent(PostMethod, new Uri(TwipplePhotoUploadEndpointV2), null, binaly, ref content, null, null);
+        }
+
+        #endregion
+
+        public bool CheckValidExtension(string ext)
+        {
+            return _pictureExtensions.Contains(ext, StringComparer.InvariantCultureIgnoreCase);
+        }
+
+        public string GetFileOpenDialogFilter()
+        {
+            var filter = new StringBuilder("Image Files(", 128);
+            var sb = new StringBuilder(64);
+            foreach (var photoExtension in _pictureExtensions)
+            {
+                sb.Append('*');
+                sb.Append(photoExtension);
+                sb.Append(';');
+            }
+            filter.Append(sb);
+            filter.Append(")|");
+            filter.Append(sb);
+            return filter.ToString();
+        }
+
+        public MyCommon.UploadFileType GetFileType(string ext)
+        {
+            return CheckValidExtension(ext)
+                       ? MyCommon.UploadFileType.Picture
+                       : MyCommon.UploadFileType.Invalid;
+        }
+
+        public bool IsSupportedFileType(MyCommon.UploadFileType type)
+        {
+            return type == MyCommon.UploadFileType.Picture;
+        }
+
+        public bool CheckValidFilesize(string ext, long fileSize)
+        {
+            return CheckValidExtension(ext) && fileSize <= MaxFileSize;
+        }
+
+        public bool Configuration(string key, object value)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

--- a/OpenTween/OpenTween.csproj
+++ b/OpenTween/OpenTween.csproj
@@ -90,6 +90,7 @@
     <Compile Include="Connection\IHttpConnection.cs" />
     <Compile Include="Connection\imgly.cs" />
     <Compile Include="Connection\IMultimediaShareService.cs" />
+    <Compile Include="Connection\TwipplePhoto.cs" />
     <Compile Include="EventViewerDialog.cs">
       <SubType>Form</SubType>
     </Compile>

--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -1,6 +1,7 @@
 更新履歴
 
 ==== Ver 1.1.2-beta1(2013/xx/xx)
+ * NEW: 画像アップロード対応サービスについっぷるフォトを追加
  * CHG: 画像アップロード対応サービスから Lockerz を削除 (API廃止のため)
  * FIX: Twitpic, yfrog, img.ly に画像をアップロードすることができない問題を修正
 

--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -31,23 +31,23 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
+using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Linq;
+using System.Media;
+using System.Net;
+using System.Reflection;
 using System.Text;
-using System.Windows.Forms;
-using OpenTween.OpenTweenCustomControl;
-using System.IO;
 using System.Text.RegularExpressions;
-using System.Reflection;
 using System.Threading;
-using System.Media;
-using System.Web;
-using System.Diagnostics;
-using OpenTween.Thumbnail;
 using System.Threading.Tasks;
-using System.Net;
+using System.Windows.Forms;
+
 using OpenTween.Api;
+using OpenTween.Connection;
+using OpenTween.OpenTweenCustomControl;
+using OpenTween.Thumbnail;
 
 namespace OpenTween
 {
@@ -1294,7 +1294,8 @@ namespace OpenTween
                 {"TwitPic", new TwitPic(tw)},
                 {"img.ly", new imgly(tw)},
                 {"yfrog", new yfrog(tw)},
-                {"Twitter", new TwitterPhoto(tw)}
+                {"Twitter", new TwitterPhoto(tw)},
+                {"ついっぷるフォト", new TwipplePhoto(tw)}
             };
         }
 
@@ -12466,10 +12467,12 @@ namespace OpenTween
             string svc = "";
             if (ImageServiceCombo.SelectedIndex > -1) svc = ImageServiceCombo.SelectedItem.ToString();
             ImageServiceCombo.Items.Clear();
-            ImageServiceCombo.Items.Add("TwitPic");
-            ImageServiceCombo.Items.Add("img.ly");
-            ImageServiceCombo.Items.Add("yfrog");
-            ImageServiceCombo.Items.Add("Twitter");
+            
+            // Add service names to combobox
+            foreach (var key in pictureService.Keys)
+            {
+                ImageServiceCombo.Items.Add(key);
+            }
 
             if (string.IsNullOrEmpty(svc))
             {