Make timeout configurable by implementer

Author: mnadareski

SabreTools.RedumpLib/Web/CookieWebClient.cs

@@ -6,6 +6,11 @@ namespace SabreTools.RedumpLib.Web
 {
     internal class CookieWebClient : WebClient
     {
+        /// <summary>
+        /// The timespan to wait before the request times out.
+        /// </summary>
+        public TimeSpan Timeout { get; set; }
+
         // https://stackoverflow.com/questions/1777221/using-cookiecontainer-with-webclient-class
         private readonly CookieContainer _container = new();
 
@@ -33,7 +38,7 @@ protected override WebRequest GetWebRequest(Uri address)
             WebRequest request = base.GetWebRequest(address);
             if (request is HttpWebRequest webRequest)
             {
-                webRequest.Timeout = 30 * 1000; // 30 seconds
+                webRequest.Timeout = (int)Timeout.TotalMilliseconds;
                 webRequest.CookieContainer = _container;
             }
 

SabreTools.RedumpLib/Web/RedumpClient.cs

@@ -31,41 +31,45 @@ public class RedumpClient
         /// <summary>
         /// Maximum retry count for any operation
         /// </summary>
-        public int RetryCount { get; private set; } = 3;
+        public int RetryCount { get; }
 
         /// <summary>
-        /// Internal client for interaction
+        /// Maximum number of seconds for a retry
         /// </summary>
-#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
-        private CookieWebClient _internalClient;
-#else
-        private HttpClient _internalClient;
-#endif
-
-        #endregion
+        public int TimeoutSeconds { get; }
 
         /// <summary>
-        /// Constructor
+        /// Internal client for interaction
         /// </summary>
-        public RedumpClient()
-        {
 #if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
-            _internalClient = new CookieWebClient();
+        private readonly CookieWebClient _internalClient;
 #else
-            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(30) };
+        private readonly HttpClient _internalClient;
 #endif
-        }
+
+        #endregion
 
         /// <summary>
         /// Constructor
         /// </summary>
-        public RedumpClient(int retryCount) : this()
+        public RedumpClient(int retryCount = 3, int timeoutSeconds = 30)
         {
             // Ensure there are a positive number of retries
             if (retryCount <= 0)
                 retryCount = 3;
 
+            // Ensure a positive timespan
+            if (timeoutSeconds <= 0)
+                timeoutSeconds = 30;
+
             RetryCount = retryCount;
+            TimeoutSeconds = timeoutSeconds;
+
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
+            _internalClient = new CookieWebClient() { Timeout = TimeSpan.FromSeconds(TimeoutSeconds) };
+#else
+            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(TimeoutSeconds) };
+#endif
         }
 
         #region Credentials
@@ -861,7 +865,7 @@ public async Task<Dictionary<RedumpSystem, byte[]>> DownloadPacks(string url, Re
 
         /// <summary>
         /// Download a set of packs
-        /// </summary> 
+        /// </summary>
         /// <param name="url">Base URL to download using</param>
         /// <param name="systems">Systems to download packs for</param>
         /// <param name="title">Name of the pack that is downloading</param>