From db4717b714132b1cf18a91dbba07901efb530f00 Mon Sep 17 00:00:00 2001
From: kaso17 <kaso17@users.noreply.github.com>
Date: Sat, 10 Dec 2016 18:01:45 +0100
Subject: [PATCH] XSpeeds: Login again only if it's necessary

---
 src/Jackett/Indexers/XSpeeds.cs | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/Jackett/Indexers/XSpeeds.cs b/src/Jackett/Indexers/XSpeeds.cs
index 86e8ee1d4..02c0f4580 100644
--- a/src/Jackett/Indexers/XSpeeds.cs
+++ b/src/Jackett/Indexers/XSpeeds.cs
@@ -247,37 +247,15 @@ namespace Jackett.Indexers
                     { "username", configData.Username.Value },
                     { "password", configData.Password.Value }
                 };
-                var result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, CookieHeader, true, null, SiteLink, true);
-                if (!result.Cookies.Trim().Equals(prevCook.Trim()))
-                {
-                    result = await RequestLoginAndFollowRedirect(LoginUrl, pairs, result.Cookies, true, SearchUrl, SiteLink, true);
-                }
-                CookieHeader = result.Cookies;
 
-                var attempt = 1;
                 var searchPage = await PostDataWithCookiesAndRetry(SearchUrl, searchParams, CookieHeader);
-                while (searchPage.IsRedirect && attempt < 3)
+                // Occasionally the cookies become invalid, login again if that happens
+                if (searchPage.IsRedirect)
                 {
-                    // add any cookies
-                    var cookieString = CookieHeader;
-                    if (searchPage.Cookies != null)
-                    {
-                        cookieString += " " + searchPage.Cookies;
-                        // resolve cookie conflicts - really no need for this as the webclient will handle it
-                        var expression = new Regex(@"([^\s]+)=([^=]+)(?:\s|$)");
-                        var cookieDIctionary = new Dictionary<string, string>();
-                        var matches = expression.Match(cookieString);
-                        while (matches.Success)
-                        {
-                            if (matches.Groups.Count > 2) cookieDIctionary[matches.Groups[1].Value] = matches.Groups[2].Value;
-                            matches = matches.NextMatch();
-                        }
-                        cookieString = string.Join(" ", cookieDIctionary.Select(kv => kv.Key.ToString() + "=" + kv.Value.ToString()).ToArray());
-                    }
-                    CookieHeader = cookieString;
-                    attempt++;
+                    await ApplyConfiguration(null);
                     searchPage = await PostDataWithCookiesAndRetry(SearchUrl, searchParams, CookieHeader);
                 }
+
                 try
                 {
                     CQ dom = searchPage.Content;