Commit: bc06fdee5e87659f55fd398144ba11b1b73afeea - UserStreamEx (git)

LINQ To TwitterのUserStreamをもっと使いやすくしようとか妄想してるプロジェクト

Commit MetaInfo

• Revision: bc06fdee5e87659f55fd398144ba11b1b73afeea (tree)
• Zeit: 2011-02-09 18:33:23
• Autor: azyobuzin <azyobuzin@user...>
• Commiter: azyobuzin

Log Message

・Stopメソッドで停止したときにStoppedEventArgs.ReasonがErrorになる不具合を修正
・メソッドチェーンでつなげるようにした
・コード整理

Ändern Zusammenfassung

• add: UserStreamEx/EventArgs.cs
• modified: UserStreamEx/Extensions.cs
• add: UserStreamEx/Interfaces.cs
• modified: UserStreamEx/Properties/AssemblyInfo.cs
• modified: UserStreamEx/Readme.txt
• modified: UserStreamEx/UserStreamEx.cs
• modified: UserStreamEx/UserStreamEx.csproj

Diff

--- /dev/null
+++ b/UserStreamEx/EventArgs.cs
@@ -0,0 +1,179 @@
+using System;
+using System.Globalization;
+using System.Xml.Linq;
+using Codeplex.Data;
+using LinqToTwitter;
+
+namespace Azyobuzi.UserStreamEx
+{
+    public class StoppedEventArgs : EventArgs
+    {
+        public StoppedEventArgs(StopReason reason, Exception ex)
+        {
+            this.Reason = reason;
+            this.Exception = ex;
+        }
+
+        public StopReason Reason { private set; get; }
+        public Exception Exception { private set; get; }
+    }
+
+    public enum StopReason
+    {
+        /// <summary>
+        /// Twitterが切断
+        /// </summary>
+        CloseResponse,
+        /// <summary>
+        /// Stopメソッドが呼ばれた
+        /// </summary>
+        UserStop,
+        /// <summary>
+        /// その他の例外
+        /// </summary>
+        Error
+    }
+
+    public class ReceiveJsonEventArgs : EventArgs
+    {
+        public ReceiveJsonEventArgs(string line)
+        {
+            this.Line = line;
+        }
+
+        public string Line { private set; get; }
+    }
+
+    public class ReceiveFriendsEventArgs : ReceiveJsonEventArgs
+    {
+        public ReceiveFriendsEventArgs(string line)
+            : base(line)
+        {
+            FriendIds = (string[])DynamicJson.Parse(line).friends;
+        }
+
+        public string[] FriendIds { private set; get; }
+    }
+
+    public class NewTweetEventArgs : ReceiveJsonEventArgs
+    {
+        public NewTweetEventArgs(string line)
+            : base(line)
+        {
+            Status = Status.CreateStatus(line.JsonToXml());
+        }
+
+        public Status Status { private set; get; }
+    }
+
+    public class NewDirectMessageEventArgs : ReceiveJsonEventArgs
+    {
+        public NewDirectMessageEventArgs(string line)
+            : base(line)
+        {
+            var json = DynamicJson.Parse(line).direct_message;
+            DirectMessage = new DirectMessage()
+            {
+                ID = (ulong)json.id,
+                SenderID = (ulong)json.sender_id,
+                Text = json.text,
+                RecipientID = (ulong)json.recipient_id,
+                CreatedAt = DateTime.ParseExact(json.created_at, "ddd MMM dd HH:mm:ss %zzzz yyyy", CultureInfo.InvariantCulture),
+                SenderScreenName = json.sender_screen_name,
+                RecipientScreenName = json.recipient_screen_name,
+                Sender = User.CreateUser(((string)json.sender.ToString()).JsonToXml()),
+                Recipient = User.CreateUser(((string)json.recipient.ToString()).JsonToXml())
+            };
+        }
+
+        public DirectMessage DirectMessage { private set; get; }
+    }
+
+    public class DeleteStatusEventArgs : ReceiveJsonEventArgs
+    {
+        public DeleteStatusEventArgs(string line)
+            : base(line)
+        {
+            var json = DynamicJson.Parse(line).delete;
+            if (!json.direct_message())
+            {
+                //ツイート
+                StatusId = json.status.id_str;
+                UserId = json.status.user_id_str;
+                IsDirectMessage = false;
+            }
+            else
+            {
+                //DM
+                StatusId = json.direct_message.id.ToString();
+                UserId = json.direct_message.user_id.ToString();
+                IsDirectMessage = true;
+            }
+        }
+
+        public string StatusId { private set; get; }
+        public string UserId { private set; get; }
+        public bool IsDirectMessage { private set; get; }
+    }
+
+    public class ReceiveEventEventArgs : ReceiveJsonEventArgs
+    {
+        public ReceiveEventEventArgs(string line)
+            : base(line)
+        {
+            var json = DynamicJson.Parse(line);
+            EventTypes eventType = EventTypes.Unknown;
+            Enum.TryParse(((string)json.@event).Replace("_", ""), true, out eventType);
+            EventType = eventType;
+            CreatedAt = DateTime.ParseExact(json.created_at, "ddd MMM dd HH:mm:ss %zzzz yyyy", CultureInfo.InvariantCulture).ToLocalTime();
+            Source = User.CreateUser(((string)json.source.ToString()).JsonToXml());
+            Target = User.CreateUser(((string)json.target.ToString()).JsonToXml());
+            if (json.target_object())
+            {
+                if (json.target_object.mode())
+                {
+                    //リスト
+                    TargetList = List.CreateList(((string)json.target_object.ToString()).JsonToXml(), new XElement("lists_list"));
+                }
+                else
+                {
+                    //ツイート
+                    TargetStatus = Status.CreateStatus(((string)json.target_object.ToString()).JsonToXml());
+                }
+            }
+        }
+
+        public EventTypes EventType { private set; get; }
+        public DateTime CreatedAt { private set; get; }
+        public User Source { private set; get; }
+        public User Target { private set; get; }
+        public Status TargetStatus { private set; get; }
+        public List TargetList { private set; get; }
+    }
+
+    public enum EventTypes
+    {
+        Unknown,
+        Favorite,
+        Unfavorite,
+        Follow,
+        ListMemberAdded,
+        ListMemberRemoved,
+        Block,
+        Unblock,
+        UserUpdate,
+        ListCreated,
+        ListDestroyed
+    }
+
+    public class TrackLimitEventArgs : ReceiveJsonEventArgs
+    {
+        public TrackLimitEventArgs(string line)
+            : base(line)
+        {
+            Track = (ulong)DynamicJson.Parse(line).limit.track;
+        }
+
+        public ulong Track { private set; get; }
+    }
+}

--- a/UserStreamEx/Extensions.cs
+++ b/UserStreamEx/Extensions.cs
@@ -8,7 +8,7 @@ namespace Azyobuzi.UserStreamEx
 {
     public static class AddToLinqToTwitter
     {
-        public static UserStream UserStreamEx(this TwitterContext twCtx)
+        public static INotStartedUserStream UserStreamEx(this TwitterContext twCtx)
         {
             return new UserStream(twCtx.AuthorizedClient);
         }

--- /dev/null
+++ b/UserStreamEx/Interfaces.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace Azyobuzi.UserStreamEx
+{
+    public interface INotStartedUserStream
+    {
+        IStartedUserStream Start(string track, bool allReplies);
+
+        #region Events
+        event EventHandler Started;
+        event EventHandler<StoppedEventArgs> Stopped;
+        event EventHandler<ReceiveFriendsEventArgs> ReceiveFriends;
+        event EventHandler<NewTweetEventArgs> NewTweet;
+        event EventHandler<NewDirectMessageEventArgs> NewDirectMessage;
+        event EventHandler<DeleteStatusEventArgs> DeleteStatus;
+        event EventHandler<ReceiveEventEventArgs> ReceiveEvent;
+        event EventHandler<TrackLimitEventArgs> TrackLimit;
+        event EventHandler<ReceiveJsonEventArgs> ReceiveUnsupportedData;
+        #endregion
+
+        #region AddHandlerMethod
+        INotStartedUserStream SetStartedEvent(EventHandler handler);
+        INotStartedUserStream SetStoppedEvent(EventHandler<StoppedEventArgs> handler);
+        INotStartedUserStream SetReceiveFriendsEvent(EventHandler<ReceiveFriendsEventArgs> handler);
+        INotStartedUserStream SetNewTweetEvent(EventHandler<NewTweetEventArgs> handler);
+        INotStartedUserStream SetNewDirectMessageEvent(EventHandler<NewDirectMessageEventArgs> handler);
+        INotStartedUserStream SetDeleteStatusEvent(EventHandler<DeleteStatusEventArgs> handler);
+        INotStartedUserStream SetReceiveEventEvent(EventHandler<ReceiveEventEventArgs> handler);
+        INotStartedUserStream SetTrackLimitEvent(EventHandler<TrackLimitEventArgs> handler);
+        INotStartedUserStream SetReceiveUnsupportedDataEvent(EventHandler<ReceiveJsonEventArgs> handler);
+        #endregion
+    }
+
+    public interface IStartedUserStream
+    {
+        INotStartedUserStream Stop();
+        IStartedUserStream SetTimeout(int waitTime);
+    }
+}

--- a/UserStreamEx/Properties/AssemblyInfo.cs
+++ b/UserStreamEx/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

--- a/UserStreamEx/Readme.txt
+++ b/UserStreamEx/Readme.txt
@@ -16,6 +16,11 @@ LINQ to Twitter用UserStream補助ライブラリ
 何かあったら@azyobuzinまで
 
 更新履歴
+	1.1 (2011/2/9)
+		・list_destroyedイベントに対応
+		・Stopメソッドで停止したときにStoppedEventArgs.ReasonがErrorになる不具合を修正
+		・list_createdイベント発生時に例外を吐くのを修正
+		・メソッドチェーンでつなげるように改良
 	1.0.1 (2011/2/7)
 		・DirectMessageを受信したときに例外を吐くのを修正
 		・limitに対応

--- a/UserStreamEx/UserStreamEx.cs
+++ b/UserStreamEx/UserStreamEx.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
-using System.Xml.Linq;
 using Codeplex.Data;
 using LinqToTwitter;
 
 namespace Azyobuzi.UserStreamEx
 {
     public class UserStream
+        : INotStartedUserStream, IStartedUserStream
     {
         public UserStream(ITwitterAuthorizer auth)
         {
@@ -21,8 +20,10 @@ namespace Azyobuzi.UserStreamEx
         private ITwitterAuthorizer auth;
         private HttpWebRequest req;
 
-        public void Start(string track, bool allReplies)
+        public IStartedUserStream Start(string track, bool allReplies)
         {
+            if (req != null) req.Abort();
+            
             var reqUri = new UriBuilder("https://userstream.twitter.com/2/user.json");
             var param = new Dictionary<string, string>();
             if (!string.IsNullOrEmpty(track)) param.Add("track", track);
@@ -54,46 +55,25 @@ namespace Azyobuzi.UserStreamEx
 
                             if (string.IsNullOrWhiteSpace(line)) continue;
 
-                            var t = new Thread(_ =>
-                            {
-                                var _line = (string)_;
-                                var json = DynamicJson.Parse(_line);
-                                if (json.friends())
-                                {
-                                    if (ReceiveFriends != null) ReceiveFriends(this, new ReceiveFriendsEventArgs(_line));
-                                }
-                                else if (json.delete())
-                                {
-                                    if (DeleteStatus != null) DeleteStatus(this, new DeleteStatusEventArgs(_line));
-                                }
-                                else if (json.direct_message())
-                                {
-                                    if (NewDirectMessage != null) NewDirectMessage(this, new NewDirectMessageEventArgs(_line));
-                                }
-                                else if (json.@event())
-                                {
-                                    if (ReceiveEvent != null) ReceiveEvent(this, new ReceiveEventEventArgs(_line));
-                                }
-                                else if (json.limit())
-                                {
-                                    if (TrackLimit != null) TrackLimit(this, new TrackLimitEventArgs(_line));
-                                }
-                                else if (json.text())
-                                {
-                                    if (NewTweet != null) NewTweet(this, new NewTweetEventArgs(_line));
-                                }
-                                else
-                                {
-                                    if (ReceiveUnsupportedData != null) ReceiveUnsupportedData(this, new ReceiveJsonEventArgs(_line));
-                                }
-                            });
+                            var t = new Thread(RaiseEvent);
                             t.Start(line);
                         }
                     }
 
                     if (Stopped != null)
-                        Stopped(this, new StoppedEventArgs(userStop ? StopReason.UserStop : StopReason.CloseResponse, null));
-                    userStop = false;
+                        Stopped(this, new StoppedEventArgs(StopReason.CloseResponse, null));
+                }
+                catch (WebException ex)
+                {
+                    if (ex.Status == WebExceptionStatus.RequestCanceled)
+                    {
+                        if (Stopped != null)
+                            Stopped(this, new StoppedEventArgs(StopReason.UserStop, ex));
+                    }
+                    else
+                    {
+                        throw;
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -102,19 +82,73 @@ namespace Azyobuzi.UserStreamEx
                 }
                 req = null;
             }, null);
+
+            return this;
         }
 
-        private bool userStop;
+        private void RaiseEvent(object args)
+        {
+            var line = (string)args;
+            var json = DynamicJson.Parse(line);
+            if (json.friends())
+            {
+                if (ReceiveFriends != null) ReceiveFriends(this, new ReceiveFriendsEventArgs(line));
+            }
+            else if (json.delete())
+            {
+                if (DeleteStatus != null) DeleteStatus(this, new DeleteStatusEventArgs(line));
+            }
+            else if (json.direct_message())
+            {
+                if (NewDirectMessage != null) NewDirectMessage(this, new NewDirectMessageEventArgs(line));
+            }
+            else if (json.@event())
+            {
+                if (ReceiveEvent != null) ReceiveEvent(this, new ReceiveEventEventArgs(line));
+            }
+            else if (json.limit())
+            {
+                if (TrackLimit != null) TrackLimit(this, new TrackLimitEventArgs(line));
+            }
+            else if (json.text())
+            {
+                if (NewTweet != null) NewTweet(this, new NewTweetEventArgs(line));
+            }
+            else
+            {
+                if (ReceiveUnsupportedData != null) ReceiveUnsupportedData(this, new ReceiveJsonEventArgs(line));
+            }
+        }
 
-        public void Stop()
+        public INotStartedUserStream Stop()
         {
-            userStop = true;
             if (req != null) req.Abort();
             req = null;
+            return this;
+        }
+
+        public IStartedUserStream SetTimeout(int waitTime)
+        {
+            if (waitTime < 1)
+            {
+                Stop();
+            }
+            else
+            {
+                var t = new Thread(_ =>
+                {
+                    Thread.Sleep((int)_);
+                    Stop();
+                });
+                t.IsBackground = true;
+                t.Start(waitTime);
+            }
+            return this;
         }
 
         public TextWriter StreamingWriter { set; get; }
 
+        #region Events
         public event EventHandler Started;
         public event EventHandler<StoppedEventArgs> Stopped;
         public event EventHandler<ReceiveFriendsEventArgs> ReceiveFriends;
@@ -124,176 +158,62 @@ namespace Azyobuzi.UserStreamEx
         public event EventHandler<ReceiveEventEventArgs> ReceiveEvent;
         public event EventHandler<TrackLimitEventArgs> TrackLimit;
         public event EventHandler<ReceiveJsonEventArgs> ReceiveUnsupportedData;
-    }
+        #endregion
 
-    public class StoppedEventArgs : EventArgs
-    {
-        public StoppedEventArgs(StopReason reason, Exception ex)
+        #region AddHandlerMethod
+        public INotStartedUserStream SetStartedEvent(EventHandler handler)
         {
-            this.Reason = reason;
-            this.Exception = ex;
+            Started += handler;
+            return this;
         }
 
-        public StopReason Reason { private set; get; }
-        public Exception Exception { private set; get; }
-    }
-
-    public enum StopReason
-    {
-        /// <summary>
-        /// Twitterが切断
-        /// </summary>
-        CloseResponse,
-        /// <summary>
-        /// Stopメソッドが呼ばれた
-        /// </summary>
-        UserStop,
-        /// <summary>
-        /// その他の例外
-        /// </summary>
-        Error
-    }
-
-    public class ReceiveJsonEventArgs : EventArgs
-    {
-        public ReceiveJsonEventArgs(string line)
+        public INotStartedUserStream SetStoppedEvent(EventHandler<StoppedEventArgs> handler)
         {
-            this.Line = line;
+            Stopped += handler;
+            return this;
         }
 
-        public string Line { private set; get; }
-    }
-
-    public class ReceiveFriendsEventArgs : ReceiveJsonEventArgs
-    {
-        public ReceiveFriendsEventArgs(string line)
-            : base(line)
+        public INotStartedUserStream SetReceiveFriendsEvent(EventHandler<ReceiveFriendsEventArgs> handler)
         {
-            FriendIds = (string[])DynamicJson.Parse(line).friends;
+            ReceiveFriends += handler;
+            return this;
         }
 
-        public string[] FriendIds { private set; get; }
-    }
-
-    public class NewTweetEventArgs : ReceiveJsonEventArgs
-    {
-        public NewTweetEventArgs(string line)
-            : base(line)
+        public INotStartedUserStream SetNewTweetEvent(EventHandler<NewTweetEventArgs> handler)
         {
-            Status = Status.CreateStatus(line.JsonToXml());
+            NewTweet += handler;
+            return this;
         }
 
-        public Status Status { private set; get; }
-    }
-
-    public class NewDirectMessageEventArgs : ReceiveJsonEventArgs
-    {
-        public NewDirectMessageEventArgs(string line)
-            : base(line)
+        public INotStartedUserStream SetNewDirectMessageEvent(EventHandler<NewDirectMessageEventArgs> handler)
         {
-            var json = DynamicJson.Parse(line).direct_message;
-            DirectMessage = new DirectMessage()
-            {
-                ID = (ulong)json.id,
-                SenderID = (ulong)json.sender_id,
-                Text = json.text,
-                RecipientID = (ulong)json.recipient_id,
-                CreatedAt = DateTime.ParseExact(json.created_at, "ddd MMM dd HH:mm:ss %zzzz yyyy", CultureInfo.InvariantCulture),
-                SenderScreenName = json.sender_screen_name,
-                RecipientScreenName = json.recipient_screen_name,
-                Sender = User.CreateUser(((string)json.sender.ToString()).JsonToXml()),
-                Recipient = User.CreateUser(((string)json.recipient.ToString()).JsonToXml())
-            };
+            NewDirectMessage += handler;
+            return this;
         }
 
-        public DirectMessage DirectMessage { private set; get; }
-    }
-
-    public class DeleteStatusEventArgs : ReceiveJsonEventArgs
-    {
-        public DeleteStatusEventArgs(string line)
-            : base(line)
+        public INotStartedUserStream SetDeleteStatusEvent(EventHandler<DeleteStatusEventArgs> handler)
         {
-            var json = DynamicJson.Parse(line).delete;
-            if (!json.direct_message())
-            {
-                //ツイート
-                StatusId = json.status.id_str;
-                UserId = json.status.user_id_str;
-                IsDirectMessage = false;
-            }
-            else
-            {
-                //DM
-                StatusId = json.direct_message.id.ToString();
-                UserId = json.direct_message.user_id.ToString();
-                IsDirectMessage = true;
-            }
+            DeleteStatus += handler;
+            return this;
         }
 
-        public string StatusId { private set; get; }
-        public string UserId { private set; get; }
-        public bool IsDirectMessage { private set; get; }
-    }
-
-    public class ReceiveEventEventArgs : ReceiveJsonEventArgs
-    {
-        public ReceiveEventEventArgs(string line)
-            : base(line)
+        public INotStartedUserStream SetReceiveEventEvent(EventHandler<ReceiveEventEventArgs> handler)
         {
-            var json = DynamicJson.Parse(line);
-            EventTypes eventType = EventTypes.Unknown;
-            Enum.TryParse(((string)json.@event).Replace("_", ""), true, out eventType);
-            EventType = eventType;
-            CreatedAt = DateTime.ParseExact(json.created_at, "ddd MMM dd HH:mm:ss %zzzz yyyy", CultureInfo.InvariantCulture).ToLocalTime();
-            Source = User.CreateUser(((string)json.source.ToString()).JsonToXml());
-            Target = User.CreateUser(((string)json.target.ToString()).JsonToXml());
-            if (json.target_object())
-            {
-                if (json.target_object.mode())
-                {
-                    //リスト
-                    TargetList = List.CreateList(((string)json.target_object.ToString()).JsonToXml(), new XElement("lists_list"));
-                }
-                else
-                {
-                    //ツイート
-                    TargetStatus = Status.CreateStatus(((string)json.target_object.ToString()).JsonToXml());
-                }
-            }
+            ReceiveEvent += handler;
+            return this;
         }
 
-        public EventTypes EventType { private set; get; }
-        public DateTime CreatedAt { private set; get; }
-        public User Source { private set; get; }
-        public User Target { private set; get; }
-        public Status TargetStatus { private set; get; }
-        public List TargetList { private set; get; }
-    }
-
-    public enum EventTypes
-    {
-        Unknown,
-        Favorite,
-        Unfavorite,
-        Follow,
-        ListMemberAdded,
-        ListMemberRemoved,
-        Block,
-        Unblock,
-        UserUpdate,
-        ListCreated,
-        ListDestroyed
-    }
-
-    public class TrackLimitEventArgs : ReceiveJsonEventArgs
-    {
-        public TrackLimitEventArgs(string line)
-            : base(line)
+        public INotStartedUserStream SetTrackLimitEvent(EventHandler<TrackLimitEventArgs> handler)
         {
-            Track = (ulong)DynamicJson.Parse(line).limit.track;
+            TrackLimit += handler;
+            return this;
         }
 
-        public ulong Track { private set; get; }
+        public INotStartedUserStream SetReceiveUnsupportedDataEvent(EventHandler<ReceiveJsonEventArgs> handler)
+        {
+            ReceiveUnsupportedData += handler;
+            return this;
+        }
+        #endregion
     }
 }

--- a/UserStreamEx/UserStreamEx.csproj
+++ b/UserStreamEx/UserStreamEx.csproj
@@ -47,7 +47,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EventArgs.cs" />
     <Compile Include="Extensions.cs" />
+    <Compile Include="Interfaces.cs" />
     <Compile Include="UserStreamEx.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>