No commit message

vDeggial · Nov 30, 2014 · 99c37bc · 99c37bc
1 parent cc83196
commit 99c37bc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Tumbl Tool/Common Helpers/CommonHelper.cs b/Tumbl Tool/Common Helpers/CommonHelper.cs
@@ -6,6 +6,17 @@ public static class CommonHelper
     {
         private static Regex _htmlRegex = new Regex("<.*?>", RegexOptions.Compiled);
 
+
+        public static string fixURL(string url)
+        {
+            if (url.EndsWith("/"))
+            {
+                url = url.Remove(url.Length - 1);
+            }
+
+            return url;
+        }
+
         public static string getMimeType(string extension)
         {
             string mimeType = "";

diff --git a/Tumbl Tool/Common Helpers/JSONHelper.cs b/Tumbl Tool/Common Helpers/JSONHelper.cs
@@ -52,7 +52,7 @@ public static string getQueryString(string tumblrDomain, string type, int start
         {
             string query = string.Copy(jsonURL);
 
-            query += "/" + tumblrDomain + jsonPostQuery;
+            query += "/" + CommonHelper.fixURL(tumblrDomain) + "/" + jsonPostQuery;
             query += "?api_key=" + apiKey;
 
             if (!string.IsNullOrEmpty(type))

diff --git a/Tumbl Tool/Common Helpers/XMLHelper.cs b/Tumbl Tool/Common Helpers/XMLHelper.cs
@@ -79,7 +79,7 @@ public static string getQueryString(string tumblrURL, string type, int start = 0
                 query += "?num=" + ((int)postStepEnum.XML).ToString();
             }
 
-            return tumblrURL + query;
+            return CommonHelper.fixURL( tumblrURL) + query;
         }
 
         public static XDocument getXMLDocument(string url)