svnno****@sourc*****
svnno****@sourc*****
2011年 2月 23日 (水) 22:20:59 JST
Revision: 1465
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1465
Author: syo68k
Date: 2011-02-23 22:20:59 +0900 (Wed, 23 Feb 2011)
Log Message:
-----------
UserAgent作成処理修正
Modified Paths:
--------------
trunk/Tween/Google.vb
trunk/Tween/MyCommon.vb
trunk/Tween/Thumbnail.vb
-------------- next part --------------
Modified: trunk/Tween/Google.vb
===================================================================
--- trunk/Tween/Google.vb 2011-02-23 11:01:04 UTC (rev 1464)
+++ trunk/Tween/Google.vb 2011-02-23 13:20:59 UTC (rev 1465)
@@ -187,7 +187,7 @@
If String.IsNullOrEmpty(srclng) OrElse String.IsNullOrEmpty(dstlng) Then
Return False
End If
- headers.Add("User-Agent", "Tween/" + fileVersion)
+ headers.Add("User-Agent", GetUserAgentString())
headers.Add("langpair", srclng + "|" + dstlng)
headers.Add("q", source)
@@ -213,7 +213,7 @@
Dim http As New HttpVarious()
Dim apiurl As String = LanguageDetectEndPoint
Dim headers As New Dictionary(Of String, String)
- headers.Add("User-Agent", "Tween/" + fileVersion)
+ headers.Add("User-Agent", GetUserAgentString())
headers.Add("v", "1.0")
headers.Add("q", source)
Dim content As String = ""
Modified: trunk/Tween/MyCommon.vb
===================================================================
--- trunk/Tween/MyCommon.vb 2011-02-23 11:01:04 UTC (rev 1464)
+++ trunk/Tween/MyCommon.vb 2011-02-23 13:20:59 UTC (rev 1465)
@@ -555,8 +555,15 @@
'RTByMe
End Enum
- Public fileVersion As String
+ Public fileVersion As String = ""
+ Public Function GetUserAgentString() As String
+ If String.IsNullOrEmpty(fileVersion) Then
+ Throw New Exception("fileversion is not Initialized.")
+ End If
+ Return "Tween/" + fileVersion
+ End Function
+
Public WithEvents TwitterApiInfo As New ApiInformation
Public Function IsAnimatedGif(ByVal filename As String) As Boolean
Modified: trunk/Tween/Thumbnail.vb
===================================================================
--- trunk/Tween/Thumbnail.vb 2011-02-23 11:01:04 UTC (rev 1464)
+++ trunk/Tween/Thumbnail.vb 2011-02-23 13:20:59 UTC (rev 1465)
@@ -1153,7 +1153,7 @@
Dim src As String = ""
Dim imgurl As String = ""
Dim headers As New Dictionary(Of String, String)
- headers.Add("User-Agent", "Tween/" + fileVersion)
+ headers.Add("User-Agent", GetUserAgentString())
If (New HttpVarious).GetData(apiurl, headers, src, 0, args.errmsg) Then
Dim sb As New StringBuilder
Dim xdoc As New XmlDocument