Changeset 28405

Timestamp:

01/14/09 12:59:24 (4 years ago)

Author:

syo68k

Message:

マルチバイト文字のURLエンコード処理をMyCommon.vbへ分離

Location:

lang/vb2005/Tween/Tween

Files:

• MyCommon.vb (modified) (2 diffs)
• OpenURL.vb (modified) (1 diff)
• Tween.vb (modified) (2 diffs)

lang/vb2005/Tween/Tween/MyCommon.vb

@@ -21 +21 @@
 ' the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
 ' Boston, MA 02110-1301, USA.
+
+Imports System.Text
 
 Public Module MyCommon
@@ -100 +102 @@
     End Sub
 
+    ''' <summary>
+    ''' URLに含まれているマルチバイト文字列を%xx形式でエンコードします。
+    ''' <newpara>
+    ''' マルチバイト文字のコードはUTF-8またはUnicodeで自動的に判断します。
+    ''' </newpara>
+    ''' </summary>
+    ''' <param name = input>エンコード対象のURL</param>
+    ''' <returns>マルチバイト文字の部分をUTF-8/%xx形式でエンコードした文字列を返します。</returns>
+
+    Public Function urlEncodeMultibyteChar(ByVal input As String) As String
+        Dim uri As Uri
+        Dim sb As StringBuilder = New StringBuilder(256)
+retry:
+        For Each c As Char In input
+            If Convert.ToInt32(c) > 255 Then
+                uri = New Uri(input)
+                input = uri.AbsoluteUri
+                sb.Length = 0
+                GoTo retry
+            ElseIf Convert.ToInt32(c) > 127 Then
+                sb.Append("%" + Convert.ToInt16(c).ToString("X2"))
+            Else
+                sb.Append(c)
+            End If
+        Next
+        Return sb.ToString()
+    End Function
+
     Public _Outputz As Outputz
 End Module

lang/vb2005/Tween/Tween/OpenURL.vb

@@ -49 +49 @@
 
     Public Sub AddUrl(ByVal strUrl As String)
-        Dim uri As Uri
-        Dim input As String = strUrl
-
-        Dim sb As StringBuilder = New StringBuilder(256)
-retry:
-        For Each c As Char In input
-            If Convert.ToInt32(c) > 255 Then
-                uri = New Uri(input)
-                input = uri.AbsoluteUri
-                sb.Length = 0
-                GoTo retry
-            ElseIf Convert.ToInt32(c) > 127 Then
-                sb.Append("%" + Convert.ToInt16(c).ToString("X2"))
-            Else
-                sb.Append(c)
-            End If
-
-        Next
-        UrlList.Items.Add(sb.ToString())
+        UrlList.Items.Add(urlEncodeMultibyteChar(strUrl))
     End Sub
 

lang/vb2005/Tween/Tween/Tween.vb

@@ -5611 +5611 @@
 
             If PostBrowser.Document.Links.Count = 1 Then
-                Dim input As String = PostBrowser.Document.Links(0).GetAttribute("href")
-
-                Dim sb As StringBuilder = New StringBuilder(256)
-retry:
-                For Each c As Char In input
-                    If Convert.ToInt32(c) > 255 Then
-                        uri = New Uri(input)
-                        input = uri.AbsoluteUri
-                        sb.Length = 0
-                        GoTo retry
-                    ElseIf Convert.ToInt32(c) > 127 Then
-                        sb.Append("%" + Convert.ToInt16(c).ToString("X2"))
-                    Else
-                        sb.Append(c)
-                    End If
-                Next
-                openUrlStr = sb.ToString()
+                openUrlStr = urlEncodeMultiByteChar(PostBrowser.Document.Links(0).GetAttribute("href"))
             Else
                 For Each linkElm As System.Windows.Forms.HtmlElement In PostBrowser.Document.Links
@@ -5727 +5711 @@
         Next
 
-        slbl.EnsureCapacity(256)
         slbl.AppendFormat(My.Resources.SetStatusLabelText1, tur, tal, ur, al, urat, _postTimestamps.Count, _favTimestamps.Count, _tlCount)
         If SettingDialog.TimelinePeriodInt = 0 Then