Remote stands alone

DICUI.Check/Program.cs

@@ -105,10 +105,9 @@ namespace DICUI.Check
             // If credentials are invalid, alert the user
             if (!string.IsNullOrWhiteSpace(username) && !string.IsNullOrWhiteSpace(password))
             {
-                using (CookieAwareWebClient wc = new CookieAwareWebClient())
+                using (RedumpWebClient wc = new RedumpWebClient())
                 {
-                    RedumpAccess access = new RedumpAccess();
-                    if (access.RedumpLogin(wc, username, password))
+                    if (wc.Login(username, password))
                         Console.WriteLine("Redump username and password accepted!");
                     else
                         Console.WriteLine("Redump username and password denied!");

DICUI.Library/Aaru/Parameters.cs

@@ -7,6 +7,7 @@ using System.Xml;
 using System.Xml.Schema;
 using DICUI.Data;
 using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI.Aaru
 {

DICUI.Library/CleanRIp/Parameters.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using DICUI.Data;
 using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI.CleanRip
 {

DICUI.Library/DD/Parameters.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using DICUI.Data;
 using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI.DD
 {

DICUI.Library/Data/BaseParameters.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI.Data
 {

DICUI.Library/Data/Enumerations.cs

@@ -2,35 +2,6 @@
 
 namespace DICUI.Data
 {
-    /// <summary>
-    /// Category for Redump
-    /// </summary>
-    public enum DiscCategory
-    {
-        Games = 1,
-        Demos = 2,
-        Video = 3,
-        Audio = 4,
-        Multimedia = 5,
-        Applications = 6,
-        Coverdiscs = 7,
-        Educational = 8,
-        BonusDiscs = 9,
-        Preproduction = 10,
-        AddOns = 11,
-    }
-
-    /// <summary>
-    /// Dump status for Redump
-    /// </summary>
-    public enum DumpStatus
-    {
-        BadDumpRed = 2,
-        PossibleBadDumpYellow = 3,
-        OriginalMediaBlue = 4,
-        TwoOrMoreDumpsGreen = 5,
-    }
-
     /// <summary>
     /// Drive type for dumping
     /// </summary>
@@ -280,59 +251,6 @@ namespace DICUI.Data
         Custom
     };
 
-    /// <summary>
-    /// List of all disc langauges
-    /// </summary>
-    public enum Language
-    {
-        Afrikaans,
-        Arabic,
-        Basque,
-        Bulgarian,
-        Catalan,
-        Chinese,
-        Croatian,
-        Czech,
-        Danish,
-        Dutch,
-        English,
-        Finnish,
-        French,
-        Gaelic,
-        German,
-        Greek,
-        Hebrew,
-        Hindi,
-        Hungarian,
-        Italian,
-        Japanese,
-        Korean,
-        Norwegian,
-        Polish,
-        Portuguese,
-        Punjabi,
-        Romanian,
-        Russian,
-        Slovak,
-        Slovenian,
-        Spanish,
-        Swedish,
-        Tamil,
-        Thai,
-        Turkish,
-        Ukrainian,
-    }
-
-    /// <summary>
-    /// All possible language selections
-    /// </summary>
-    public enum LanguageSelection
-    {
-        BiosSettings,
-        LanguageSelector,
-        OptionsMenu,
-    }
-
     /// <summary>
     /// Known media types
     /// </summary>
@@ -466,166 +384,6 @@ namespace DICUI.Data
         TapeDSTLarge = 66,
     }
 
-    /// <summary>
-    /// List of all known Redump systems
-    /// </summary>
-    public enum RedumpSystem
-    {
-        // Special BIOS sets
-        MicrosoftXboxBIOS,
-        NintendoGameCubeBIOS,
-        SonyPlayStationBIOS,
-        SonyPlayStation2BIOS,
-
-        // Regular systems
-        AcornArchimedes,
-        AppleMacintosh,
-        AtariJaguarCDInteractiveMultimediaSystem,
-        AudioCD,
-        BandaiPippin,
-        BandaiPlaydiaQuickInteractiveSystem,
-        BDVideo,
-        CommodoreAmigaCD,
-        CommodoreAmigaCD32,
-        CommodoreAmigaCDTV,
-        DVDVideo,
-        EnhancedCD,
-        FujitsuFMTownsseries,
-        funworldPhotoPlay,
-        HasbroVideoNow,
-        HasbroVideoNowColor,
-        HasbroVideoNowJr,
-        HasbroVideoNowXP,
-        IBMPCcompatible,
-        IncredibleTechnologiesEagle,
-        KonamieAmusement,
-        KonamiFireBeat,
-        KonamiM2,
-        KonamiSystem573,
-        KonamiSystemGV,
-        KonamiTwinkle,
-        MattelFisherPriceiXL,
-        MattelHyperScan,
-        MemorexVisualInformationSystem,
-        MicrosoftXbox,
-        MicrosoftXbox360,
-        MicrosoftXboxOne,
-        NamcoSegaNintendoTriforce,
-        NamcoSystem12,
-        NamcoSystem246,
-        NavisoftNaviken21,
-        NECPCEngineCDTurboGrafxCD,
-        NECPC88series,
-        NECPC98series,
-        NECPCFXPCFXGA,
-        NintendoGameCube,
-        NintendoWii,
-        NintendoWiiU,
-        PalmOS,
-        Panasonic3DOInteractiveMultiplayer,
-        PanasonicM2,
-        PhilipsCDi,
-        PhilipsCDiDigitalVideo,
-        PhotoCD,
-        PlayStationGameSharkUpdates,
-        SegaChihiro,
-        SegaDreamcast,
-        SegaLindbergh,
-        SegaMegaCDSegaCD,
-        SegaNaomi,
-        SegaNaomi2,
-        SegaPrologue21,
-        SegaRingEdge,
-        SegaRingEdge2,
-        SegaSaturn,
-        SegaTitanVideo,
-        SharpX68000,
-        SNKNeoGeoCD,
-        SonyPlayStation,
-        SonyPlayStation2,
-        SonyPlayStation3,
-        SonyPlayStation4,
-        SonyPlayStationPortable,
-        TABAustriaQuizard,
-        TaoiKTV,
-        TomyKissSite,
-        VideoCD,
-        VMLabsNUON,
-        VTechVFlashVSmilePro,
-        ZAPiTGamesGameWaveFamilyEntertainmentSystem,
-    }
-
-    /// <summary>
-    /// List of all known Redump regions
-    /// </summary>
-    public enum Region
-    {
-        Argentina,
-        Asia,
-        AsiaEurope,
-        AsiaUSA,
-        Australia,
-        Austria,
-        AustriaSwitzerland,
-        Belgium,
-        BelgiumNetherlands,
-        Brazil,
-        Canada,
-        China,
-        Croatia,
-        Czech,
-        Denmark,
-        Europe,
-        EuropeAsia,
-        EuropeAustralia,
-        Finland,
-        France,
-        FranceSpain,
-        Germany,
-        GreaterChina,
-        Greece,
-        Hungary,
-        India,
-        Ireland,
-        Israel,
-        Italy,
-        Japan,
-        JapanAsia,
-        JapanEurope,
-        JapanKorea,
-        JapanUSA,
-        Korea,
-        LatinAmerica,
-        Netherlands,
-        Norway,
-        Poland,
-        Portugal,
-        Russia,
-        Scandinavia,
-        Singapore,
-        Slovakia,
-        SouthAfrica,
-        Spain,
-        SpainPortugal,
-        Sweden,
-        Switzerland,
-        Taiwan,
-        Thailand,
-        Turkey,
-        UnitedArabEmirates,
-        UK,
-        UKAustralia,
-        Ukraine,
-        USA,
-        USAAsia,
-        USABrazil,
-        USACanada,
-        USAEurope,
-        USAGermany,
-        USAJapan,
-        World,
-    }
-
     /// <summary>
     /// Generic yes/no values for Redump
     /// </summary>

DICUI.Library/Data/SubmissionInfo.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Net;
 using DICUI.Utilities;
+using DICUI.Web;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
@@ -146,14 +147,14 @@ namespace DICUI.Data
             // Category
             match = categoryRegex.Match(discData);
             if (match.Success)
-                this.CommonDiscInfo.Category = Converters.ToCategory(match.Groups[1].Value);
+                this.CommonDiscInfo.Category = Web.Extensions.ToCategory(match.Groups[1].Value);
             else
-                this.CommonDiscInfo.Category = Data.DiscCategory.Games;
+                this.CommonDiscInfo.Category = DiscCategory.Games;
 
             // Region
             match = regionRegex.Match(discData);
             if (match.Success)
-                this.CommonDiscInfo.Region = Converters.ToRegion(match.Groups[1].Value);
+                this.CommonDiscInfo.Region = Web.Extensions.ToRegion(match.Groups[1].Value);
 
             // Languages
             var matches = languagesRegex.Matches(discData);
@@ -161,7 +162,7 @@ namespace DICUI.Data
             {
                 List<Language?> tempLanguages = new List<Language?>();
                 foreach (Match submatch in matches)
-                    tempLanguages.Add(Converters.ToLanguage(submatch.Groups[1].Value));
+                    tempLanguages.Add(Web.Extensions.ToLanguage(submatch.Groups[1].Value));
 
                 this.CommonDiscInfo.Languages = tempLanguages.ToArray();
             }

DICUI.Library/DiscImageCreator/Parameters.cs

@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
 using BurnOutSharp.External.psxt001z;
 using DICUI.Data;
 using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI.DiscImageCreator
 {

DICUI.Library/Utilities/DumpEnvironment.cs

@@ -688,11 +688,10 @@ namespace DICUI.Utilities
                 info.DumpersAndStatus.Dumpers = new string[] { this.Username };
 
                 info.MatchedIDs = new List<int>();
-                using (CookieAwareWebClient wc = new CookieAwareWebClient())
+                using (RedumpWebClient wc = new RedumpWebClient())
                 {
                     // Login to Redump
-                    RedumpAccess access = new RedumpAccess();
-                    if (access.RedumpLogin(wc, this.Username, this.Password))
+                    if (wc.Login(this.Username, this.Password))
                     {
                         // Loop through all of the hashdata to find matching IDs
                         progress?.Report(Result.Success("Finding disc matches on Redump..."));
@@ -701,7 +700,7 @@ namespace DICUI.Utilities
                         {
                             if (GetISOHashValues(hashData, out long size, out string crc32, out string md5, out string sha1))
                             {
-                                List<int> newIds = access.ProcessSearch(wc, sha1.ToLowerInvariant());
+                                List<int> newIds = wc.ListSearchResults(sha1);
                                 if (info.MatchedIDs.Any())
                                     info.MatchedIDs = info.MatchedIDs.Intersect(newIds).ToList();
                                 else
@@ -715,7 +714,7 @@ namespace DICUI.Utilities
                         if (info.MatchedIDs.Count == 1)
                         {
                             progress?.Report(Result.Success($"Filling fields from existing ID {info.MatchedIDs[0]}..."));
-                            string discData = access.DownloadSingleSiteID(wc, info.MatchedIDs[0]);
+                            string discData = wc.DownloadSingleSiteID(info.MatchedIDs[0]);
                             info.FillFromDiscPage(discData);
                             progress?.Report(Result.Success("Information filling complete!"));
                         }

DICUI.Library/Utilities/Extensions.cs

@@ -4,224 +4,6 @@ namespace DICUI.Utilities
 {
     public static class Extensions
     {
-        #region Redump Information Lists
-
-        /// <summary>
-        /// List of systems that are not publically accessible
-        /// </summary>
-        public static readonly RedumpSystem[] BannedSystems = new RedumpSystem[]
-        {
-            RedumpSystem.AudioCD,
-            RedumpSystem.BDVideo,
-            RedumpSystem.DVDVideo,
-            RedumpSystem.HasbroVideoNow,
-            RedumpSystem.HasbroVideoNowColor,
-            RedumpSystem.HasbroVideoNowJr,
-            RedumpSystem.HasbroVideoNowXP,
-            RedumpSystem.KonamiM2,
-            RedumpSystem.MicrosoftXbox360,
-            RedumpSystem.MicrosoftXboxOne,
-            RedumpSystem.NavisoftNaviken21,
-            RedumpSystem.NintendoWii,
-            RedumpSystem.NintendoWiiU,
-            RedumpSystem.PanasonicM2,
-            RedumpSystem.PhilipsCDiDigitalVideo,
-            RedumpSystem.SegaPrologue21,
-            RedumpSystem.SegaRingEdge,
-            RedumpSystem.SegaRingEdge2,
-            RedumpSystem.SonyPlayStation3,
-            RedumpSystem.SonyPlayStation4,
-            RedumpSystem.VideoCD,
-        };
-
-        /// <summary>
-        /// List of systems that have a Cues pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasCues = new RedumpSystem[]
-        {
-            RedumpSystem.AppleMacintosh,
-            RedumpSystem.AtariJaguarCDInteractiveMultimediaSystem,
-            RedumpSystem.AudioCD,
-            RedumpSystem.BandaiPippin,
-            RedumpSystem.BandaiPlaydiaQuickInteractiveSystem,
-            RedumpSystem.CommodoreAmigaCD,
-            RedumpSystem.CommodoreAmigaCD32,
-            RedumpSystem.CommodoreAmigaCDTV,
-            RedumpSystem.FujitsuFMTownsseries,
-            RedumpSystem.funworldPhotoPlay,
-            RedumpSystem.HasbroVideoNow,
-            RedumpSystem.HasbroVideoNowColor,
-            RedumpSystem.HasbroVideoNowJr,
-            RedumpSystem.HasbroVideoNowXP,
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.IncredibleTechnologiesEagle,
-            RedumpSystem.KonamieAmusement,
-            RedumpSystem.KonamiFireBeat,
-            RedumpSystem.KonamiM2,
-            RedumpSystem.KonamiSystemGV,
-            RedumpSystem.MattelFisherPriceiXL,
-            RedumpSystem.MattelHyperScan,
-            RedumpSystem.MemorexVisualInformationSystem,
-            RedumpSystem.MicrosoftXbox,
-            RedumpSystem.MicrosoftXbox360,
-            RedumpSystem.NamcoSegaNintendoTriforce,
-            RedumpSystem.NamcoSystem246,
-            RedumpSystem.NavisoftNaviken21,
-            RedumpSystem.NECPCEngineCDTurboGrafxCD,
-            RedumpSystem.NECPC88series,
-            RedumpSystem.NECPC98series,
-            RedumpSystem.NECPCFXPCFXGA,
-            RedumpSystem.PalmOS,
-            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
-            RedumpSystem.PanasonicM2,
-            RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
-            RedumpSystem.PhotoCD,
-            RedumpSystem.PlayStationGameSharkUpdates,
-            RedumpSystem.SegaChihiro,
-            RedumpSystem.SegaDreamcast,
-            RedumpSystem.SegaMegaCDSegaCD,
-            RedumpSystem.SegaNaomi,
-            RedumpSystem.SegaNaomi2,
-            RedumpSystem.SegaPrologue21,
-            RedumpSystem.SegaSaturn,
-            RedumpSystem.SNKNeoGeoCD,
-            RedumpSystem.SonyPlayStation,
-            RedumpSystem.SonyPlayStation2,
-            RedumpSystem.SonyPlayStation3,
-            RedumpSystem.TABAustriaQuizard,
-            RedumpSystem.TomyKissSite,
-            RedumpSystem.VideoCD,
-            RedumpSystem.VTechVFlashVSmilePro,
-};
-
-        /// <summary>
-        /// List of systems that has a Dat pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasDat = new RedumpSystem[]
-        {
-            RedumpSystem.MicrosoftXboxBIOS,
-            RedumpSystem.NintendoGameCubeBIOS,
-            RedumpSystem.SonyPlayStationBIOS,
-            RedumpSystem.SonyPlayStation2BIOS,
-
-            RedumpSystem.AppleMacintosh,
-            RedumpSystem.AtariJaguarCDInteractiveMultimediaSystem,
-            RedumpSystem.AudioCD,
-            RedumpSystem.BandaiPippin,
-            RedumpSystem.BandaiPlaydiaQuickInteractiveSystem,
-            RedumpSystem.BDVideo,
-            RedumpSystem.CommodoreAmigaCD,
-            RedumpSystem.CommodoreAmigaCD32,
-            RedumpSystem.CommodoreAmigaCDTV,
-            RedumpSystem.DVDVideo,
-            RedumpSystem.FujitsuFMTownsseries,
-            RedumpSystem.funworldPhotoPlay,
-            RedumpSystem.HasbroVideoNow,
-            RedumpSystem.HasbroVideoNowColor,
-            RedumpSystem.HasbroVideoNowJr,
-            RedumpSystem.HasbroVideoNowXP,
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.IncredibleTechnologiesEagle,
-            RedumpSystem.KonamieAmusement,
-            RedumpSystem.KonamiFireBeat,
-            RedumpSystem.KonamiM2,
-            RedumpSystem.KonamiSystemGV,
-            RedumpSystem.MattelFisherPriceiXL,
-            RedumpSystem.MattelHyperScan,
-            RedumpSystem.MemorexVisualInformationSystem,
-            RedumpSystem.MicrosoftXbox,
-            RedumpSystem.MicrosoftXbox360,
-            RedumpSystem.MicrosoftXboxOne,
-            RedumpSystem.NamcoSegaNintendoTriforce,
-            RedumpSystem.NamcoSystem246,
-            RedumpSystem.NavisoftNaviken21,
-            RedumpSystem.NECPCEngineCDTurboGrafxCD,
-            RedumpSystem.NECPC88series,
-            RedumpSystem.NECPC98series,
-            RedumpSystem.NECPCFXPCFXGA,
-            RedumpSystem.NintendoGameCube,
-            RedumpSystem.NintendoWii,
-            RedumpSystem.NintendoWiiU,
-            RedumpSystem.PalmOS,
-            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
-            RedumpSystem.PanasonicM2,
-            RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
-            RedumpSystem.PhotoCD,
-            RedumpSystem.PlayStationGameSharkUpdates,
-            RedumpSystem.SegaChihiro,
-            RedumpSystem.SegaDreamcast,
-            RedumpSystem.SegaLindbergh,
-            RedumpSystem.SegaMegaCDSegaCD,
-            RedumpSystem.SegaNaomi,
-            RedumpSystem.SegaNaomi2,
-            RedumpSystem.SegaRingEdge,
-            RedumpSystem.SegaRingEdge2,
-            RedumpSystem.SegaSaturn,
-            RedumpSystem.SNKNeoGeoCD,
-            RedumpSystem.SonyPlayStation,
-            RedumpSystem.SonyPlayStation2,
-            RedumpSystem.SonyPlayStation3,
-            RedumpSystem.SonyPlayStation4,
-            RedumpSystem.SonyPlayStationPortable,
-            RedumpSystem.TABAustriaQuizard,
-            RedumpSystem.TomyKissSite,
-            RedumpSystem.VideoCD,
-            RedumpSystem.VMLabsNUON,
-            RedumpSystem.VTechVFlashVSmilePro,
-            RedumpSystem.ZAPiTGamesGameWaveFamilyEntertainmentSystem,
-        };
-
-        /// <summary>
-        /// List of systems that has a Decrypted Keys pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasDkeys = new RedumpSystem[]
-        {
-            RedumpSystem.SonyPlayStation3,
-        };
-
-        /// <summary>
-        /// List of systems that has a GDI pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasGdi = new RedumpSystem[]
-        {
-            RedumpSystem.NamcoSegaNintendoTriforce,
-            RedumpSystem.SegaChihiro,
-            RedumpSystem.SegaDreamcast,
-            RedumpSystem.SegaNaomi,
-            RedumpSystem.SegaNaomi2,
-        };
-
-        /// <summary>
-        /// List of systems that has a Keys pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasKeys = new RedumpSystem[]
-        {
-            RedumpSystem.NintendoWiiU,
-            RedumpSystem.SonyPlayStation3,
-        };
-
-        /// <summary>
-        /// List of systems that has an LSD pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasLsd = new RedumpSystem[]
-        {
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.SonyPlayStation,
-        };
-
-        /// <summary>
-        /// List of systems that has an SBI pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasSbi = new RedumpSystem[]
-        {
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.SonyPlayStation,
-        };
-
-        #endregion
-
         public static bool DoesSupportDriveSpeed(this MediaType? type)
         {
             switch (type)

DICUI.Library/Web/CookieAwareWebClient.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Net;
-
-namespace DICUI.Web
-{
-    // https://stackoverflow.com/questions/1777221/using-cookiecontainer-with-webclient-class
-    public class CookieAwareWebClient : WebClient
-    {
-        private readonly CookieContainer m_container = new CookieContainer();
-
-        protected override WebRequest GetWebRequest(Uri address)
-        {
-            WebRequest request = base.GetWebRequest(address);
-            HttpWebRequest webRequest = request as HttpWebRequest;
-            if (webRequest != null)
-            {
-                webRequest.CookieContainer = m_container;
-            }
-
-            return request;
-        }
-
-        /// <summary>
-        /// Get the last downloaded filename, if possible
-        /// </summary>
-        /// <returns></returns>
-        public string GetLastFilename()
-        {
-            // Try to extract the filename from the Content-Disposition header
-            if (!string.IsNullOrEmpty(this.ResponseHeaders["Content-Disposition"]))
-                return this.ResponseHeaders["Content-Disposition"].Substring(this.ResponseHeaders["Content-Disposition"].IndexOf("filename=") + 9).Replace("\"", "");
-
-            return null;
-        }
-    }
-}

DICUI.Library/Web/Enumerations.cs

@@ -0,0 +1,244 @@
+namespace DICUI.Web
+{
+    /// <summary>
+    /// List of all disc categories
+    /// </summary>
+    public enum DiscCategory
+    {
+        Games = 1,
+        Demos = 2,
+        Video = 3,
+        Audio = 4,
+        Multimedia = 5,
+        Applications = 6,
+        Coverdiscs = 7,
+        Educational = 8,
+        BonusDiscs = 9,
+        Preproduction = 10,
+        AddOns = 11,
+    }
+
+    /// <summary>
+    /// Dump status
+    /// </summary>
+    public enum DumpStatus
+    {
+        BadDumpRed = 2,
+        PossibleBadDumpYellow = 3,
+        OriginalMediaBlue = 4,
+        TwoOrMoreDumpsGreen = 5,
+    }
+
+    /// <summary>
+    /// List of all disc langauges
+    /// </summary>
+    public enum Language
+    {
+        Afrikaans,
+        Arabic,
+        Basque,
+        Bulgarian,
+        Catalan,
+        Chinese,
+        Croatian,
+        Czech,
+        Danish,
+        Dutch,
+        English,
+        Finnish,
+        French,
+        Gaelic,
+        German,
+        Greek,
+        Hebrew,
+        Hindi,
+        Hungarian,
+        Italian,
+        Japanese,
+        Korean,
+        Norwegian,
+        Polish,
+        Portuguese,
+        Punjabi,
+        Romanian,
+        Russian,
+        Slovak,
+        Slovenian,
+        Spanish,
+        Swedish,
+        Tamil,
+        Thai,
+        Turkish,
+        Ukrainian,
+    }
+
+    /// <summary>
+    /// All possible language selections
+    /// </summary>
+    public enum LanguageSelection
+    {
+        BiosSettings,
+        LanguageSelector,
+        OptionsMenu,
+    }
+
+    /// <summary>
+    /// List of all known Redump systems
+    /// </summary>
+    public enum RedumpSystem
+    {
+        // Special BIOS sets
+        MicrosoftXboxBIOS,
+        NintendoGameCubeBIOS,
+        SonyPlayStationBIOS,
+        SonyPlayStation2BIOS,
+
+        // Regular systems
+        AcornArchimedes,
+        AppleMacintosh,
+        AtariJaguarCDInteractiveMultimediaSystem,
+        AudioCD,
+        BandaiPippin,
+        BandaiPlaydiaQuickInteractiveSystem,
+        BDVideo,
+        CommodoreAmigaCD,
+        CommodoreAmigaCD32,
+        CommodoreAmigaCDTV,
+        DVDVideo,
+        EnhancedCD,
+        FujitsuFMTownsseries,
+        funworldPhotoPlay,
+        HasbroVideoNow,
+        HasbroVideoNowColor,
+        HasbroVideoNowJr,
+        HasbroVideoNowXP,
+        IBMPCcompatible,
+        IncredibleTechnologiesEagle,
+        KonamieAmusement,
+        KonamiFireBeat,
+        KonamiM2,
+        KonamiSystem573,
+        KonamiSystemGV,
+        KonamiTwinkle,
+        MattelFisherPriceiXL,
+        MattelHyperScan,
+        MemorexVisualInformationSystem,
+        MicrosoftXbox,
+        MicrosoftXbox360,
+        MicrosoftXboxOne,
+        NamcoSegaNintendoTriforce,
+        NamcoSystem12,
+        NamcoSystem246,
+        NavisoftNaviken21,
+        NECPCEngineCDTurboGrafxCD,
+        NECPC88series,
+        NECPC98series,
+        NECPCFXPCFXGA,
+        NintendoGameCube,
+        NintendoWii,
+        NintendoWiiU,
+        PalmOS,
+        Panasonic3DOInteractiveMultiplayer,
+        PanasonicM2,
+        PhilipsCDi,
+        PhilipsCDiDigitalVideo,
+        PhotoCD,
+        PlayStationGameSharkUpdates,
+        SegaChihiro,
+        SegaDreamcast,
+        SegaLindbergh,
+        SegaMegaCDSegaCD,
+        SegaNaomi,
+        SegaNaomi2,
+        SegaPrologue21,
+        SegaRingEdge,
+        SegaRingEdge2,
+        SegaSaturn,
+        SegaTitanVideo,
+        SharpX68000,
+        SNKNeoGeoCD,
+        SonyPlayStation,
+        SonyPlayStation2,
+        SonyPlayStation3,
+        SonyPlayStation4,
+        SonyPlayStationPortable,
+        TABAustriaQuizard,
+        TaoiKTV,
+        TomyKissSite,
+        VideoCD,
+        VMLabsNUON,
+        VTechVFlashVSmilePro,
+        ZAPiTGamesGameWaveFamilyEntertainmentSystem,
+    }
+
+    /// <summary>
+    /// List of all known Redump regions
+    /// </summary>
+    public enum Region
+    {
+        Argentina,
+        Asia,
+        AsiaEurope,
+        AsiaUSA,
+        Australia,
+        Austria,
+        AustriaSwitzerland,
+        Belgium,
+        BelgiumNetherlands,
+        Brazil,
+        Canada,
+        China,
+        Croatia,
+        Czech,
+        Denmark,
+        Europe,
+        EuropeAsia,
+        EuropeAustralia,
+        Finland,
+        France,
+        FranceSpain,
+        Germany,
+        GreaterChina,
+        Greece,
+        Hungary,
+        India,
+        Ireland,
+        Israel,
+        Italy,
+        Japan,
+        JapanAsia,
+        JapanEurope,
+        JapanKorea,
+        JapanUSA,
+        Korea,
+        LatinAmerica,
+        Netherlands,
+        Norway,
+        Poland,
+        Portugal,
+        Russia,
+        Scandinavia,
+        Singapore,
+        Slovakia,
+        SouthAfrica,
+        Spain,
+        SpainPortugal,
+        Sweden,
+        Switzerland,
+        Taiwan,
+        Thailand,
+        Turkey,
+        UnitedArabEmirates,
+        UK,
+        UKAustralia,
+        Ukraine,
+        USA,
+        USAAsia,
+        USABrazil,
+        USACanada,
+        USAEurope,
+        USAGermany,
+        USAJapan,
+        World,
+    }
+}

DICUI.Library/Web/RedumpAccess.cs

@@ -1,386 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using DICUI.Data;
-using DICUI.Utilities;
-
-namespace DICUI.Web
-{
-    public class RedumpAccess
-    {
-        #region Base URLs
-
-        private const string loginUrl = "http://forum.redump.org/login/";
-
-        #endregion
-
-        #region Disc URLs and Extensions
-
-        private const string discPageUrl = @"http://redump.org/disc/{0}/";
-        private const string wipDiscPageUrl = @"http://redump.org/newdisc/{0}/";
-
-        private const string changesExt = "/changes/";
-        private const string cueExt = "cue/";
-        private const string gdiExt = "gdi/";
-        private const string keyExt = "key/";
-        private const string md5Ext = "md5/";
-        private const string sbiExt = "sbi/";
-        private const string sfvExt = "sfv/";
-        private const string sha1Ext = "sha1/";
-
-        #endregion
-
-        #region List URLs
-
-        private const string lastModifiedUrl = @"http://redump.org/discs/sort/modified/dir/desc?page={0}";
-        private const string quickSearchUrl = @"http://redump.org/discs/quicksearch/{0}/?page={1}";
-        private const string userDumpsUrl = @"http://redump.org/discs/dumper/{0}/?page={1}";
-        private const string wipDumpsUrl = @"http://redump.org/discs-wip/";
-
-        #endregion
-
-        #region Pack URLs
-
-        private const string packCuesUrl = @"http://redump.org/cues/{0}/";
-        private const string packDatfileUrl = @"http://redump.org/datfile/{0}/";
-        private const string packDkeysUrl = @"http://redump.org/dkeys/{0}/";
-        private const string packGdiUrl = @"http://redump.org/gdi/{0}/";
-        private const string packKeysUrl = @"http://redump.org/keys/{0}/";
-        private const string packSbiUrl = @"http://redump.org/sbi/{0}/";
-
-        #endregion
-
-        #region Regexes
-
-        private readonly Regex discRegex = new Regex(@"<a href=""/disc/(\d+)/"">");
-        private readonly Regex newDiscRegex = new Regex(@"<a href=""/newdisc/(\d+)/"">");
-        private readonly Regex tokenRegex = new Regex(@"<input type=""hidden"" name=""csrf_token"" value=""(.*?)"" />");
-
-        #endregion
-
-        /// <summary>
-        /// Login to Redump, if possible
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
-        /// <param name="username">Redump username to log in for protected systems</param>
-        /// <param name="password">Redump password to log in for protected systems</param>
-        /// <returns>True login was successful, false otherwise</returns>
-        public bool RedumpLogin(CookieAwareWebClient wc, string username, string password)
-        {
-            if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password))
-                return false;
-
-            var loginPage = wc.DownloadString(loginUrl);
-            string token = this.tokenRegex.Match(loginPage).Groups[1].Value;
-
-            wc.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded";
-            wc.Encoding = Encoding.UTF8;
-            var response = wc.UploadString(loginUrl, $"form_sent=1&redirect_url=&csrf_token={token}&req_username={username}&req_password={password}&save_pass=0");
-
-            if (response.Contains("Incorrect username and/or password."))
-                return false;
-            else
-                return true;
-        }
-
-        #region Process IDs and Pages
-
-        /// <summary>
-        /// Get the list of the last modified IDs, in order of appearance
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
-        /// <param name="pageCount">Number of pages to grab until stopping; -1 means continue until end</param>
-        /// <returns>A list of IDs in order of last modified</returns>
-        private List<int> ProcessLastModified(CookieAwareWebClient wc, int pageCount = -1)
-        {
-            List<int> ids = new List<int>();
-
-            // If we have a -1 page count, set the maximum page limit
-            if (pageCount == -1)
-                pageCount = Int32.MaxValue;
-
-            // Keep getting last modified pages until there are none left
-            int pageNumber = 1;
-            while (pageNumber < pageCount)
-            {
-                List<int> pageIds = CheckSingleSitePage(wc, string.Format(lastModifiedUrl, pageNumber++));
-                ids.AddRange(pageIds);
-                if (pageIds.Count < 2)
-                    break;
-            }
-
-            return ids;
-        }
-
-        /// <summary>
-        /// Retrieve premade packs from Redump
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
-        private void ProcessAllPacks(CookieAwareWebClient wc)
-        {
-            var cuesPacks = this.DownloadPacks(wc, packCuesUrl, Extensions.HasCues, "CUEs");
-            var datPacks = this.DownloadPacks(wc, packDatfileUrl, Extensions.HasDat, "DATs");
-            var dkeyPacks = this.DownloadPacks(wc, packDkeysUrl, Extensions.HasDkeys, "Decrypted KEYS");
-            var gdiPacks = this.DownloadPacks(wc, packGdiUrl, Extensions.HasGdi, "GDIs");
-            var keysPacks = this.DownloadPacks(wc, packKeysUrl, Extensions.HasKeys, "KEYS");
-            var sbiPacks = this.DownloadPacks(wc, packSbiUrl, Extensions.HasSbi, "SBIs");
-        }
-
-        /// <summary>
-        /// Retrieve premade packs from Redump
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
-        /// <param name="system">RedumpSystem to get all possible packs for</param>
-        private void ProcessPacksForSystem(CookieAwareWebClient wc, RedumpSystem system)
-        {
-            var packs = new Dictionary<string, byte[]>();
-
-            if (Extensions.HasCues.Contains(system))
-                packs.Add("cues", this.DownloadPack(wc, packCuesUrl, system, "CUEs"));
-
-            if (Extensions.HasDat.Contains(system))
-                packs.Add("dat", this.DownloadPack(wc, packDatfileUrl, system, "DATs"));
-
-            if (Extensions.HasDkeys.Contains(system))
-                packs.Add("dkeys", this.DownloadPack(wc, packDkeysUrl, system, "Decrypted KEYS"));
-
-            if (Extensions.HasGdi.Contains(system))
-                packs.Add("gdi", this.DownloadPack(wc, packGdiUrl, system, "GDIs"));
-
-            if (Extensions.HasKeys.Contains(system))
-                packs.Add("keys", this.DownloadPack(wc, packKeysUrl, system, "KEYS"));
-
-            if (Extensions.HasSbi.Contains(system))
-                packs.Add("sbi", this.DownloadPack(wc, packSbiUrl, system, "SBIs"));
-        }
-
-        /// <summary>
-        /// Get the list of IDs that associate with a given string
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
-        /// <param name="query">Value to search for in Redump</param>
-        /// <returns>A list of IDs associated with that value</returns>
-        public List<int> ProcessSearch(CookieAwareWebClient wc, string query)
-        {
-            List<int> ids = new List<int>();
-            query = query.ToLowerInvariant().Replace(' ', '-');
-
-            // Keep getting quicksearch pages until there are none left
-            int pageNumber = 1;
-            while (true)
-            {
-                List<int> pageIds = CheckSingleSitePage(wc, string.Format(quickSearchUrl, query, pageNumber++));
-                ids.AddRange(pageIds);
-                if (pageIds.Count < 2)
-                    break;
-            }
-
-            return ids;
-        }
-
-        /// <summary>
-        /// Get the list of IDs associated with the given user
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
-        /// <param name="username">Redump username to get the list of IDs for</param>
-        /// <returns>A list of IDs associated with that user</returns>
-        private List<int> ProcessUser(CookieAwareWebClient wc, string username)
-        {
-            List<int> ids = new List<int>();
-
-            // Keep getting user pages until there are none left
-            int pageNumber = 1;
-            while (true)
-            {
-                List<int> pageIds = CheckSingleSitePage(wc, string.Format(userDumpsUrl, username, pageNumber++));
-                ids.AddRange(pageIds);
-                if (pageIds.Count < 2)
-                    break;
-            }
-
-            return ids;
-        }
-
-        #endregion
-
-        #region Single item processing
-
-        /// <summary>
-        /// Process a Redump site page as a list of possible IDs or disc page
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to access the pages</param>
-        /// <param name="url">Page URL to check and parse</param>
-        /// <returns>List of matching IDs</returns>
-        private List<int> CheckSingleSitePage(CookieAwareWebClient wc, string url)
-        {
-            List<int> ids = new List<int>();
-
-            var dumpsPage = wc.DownloadString(url);
-
-            // If we have no dumps left
-            if (dumpsPage.Contains("No discs found."))
-                return ids;
-
-            // If we have a single disc page already
-            if (dumpsPage.Contains("<b>Download:</b>"))
-            {
-                var value = Regex.Match(dumpsPage, @"/disc/(\d+)/sfv/").Groups[1].Value;
-                if (Int32.TryParse(value, out int id))
-                    ids.Add(id);
-
-                return ids;
-            }
-
-            // Otherwise, traverse each dump on the page
-            var matches = discRegex.Matches(dumpsPage);
-            foreach (Match match in matches)
-            {
-                try
-                {
-                    if (Int32.TryParse(match.Groups[1].Value, out int value))
-                        ids.Add(value);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"An exception has occurred: {ex}");
-                    continue;
-                }
-            }
-
-            return ids;
-        }
-
-        /// <summary>
-        /// Process a Redump WIP page as a list of possible IDs or disc page
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to access the pages</param>
-        /// <param name="url">Page URL to check and parse</param>
-        /// <returns>List of matching IDs</returns>
-        private List<int> CheckSingleWIPPage(CookieAwareWebClient wc, string url)
-        {
-            List<int> ids = new List<int>();
-
-            var wipDumpsPage = wc.DownloadString(url);
-
-            // If we have no WIP dumps left
-            if (wipDumpsPage.Contains("No WIP discs found."))
-                return ids;
-
-            // Otherwise, traverse each dump on the page
-            var matches = newDiscRegex.Matches(wipDumpsPage);
-            foreach (Match match in matches)
-            {
-                try
-                {
-                    if (Int32.TryParse(match.Groups[1].Value, out int value))
-                        ids.Add(value);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"An exception has occurred: {ex}");
-                    continue;
-                }
-            }
-
-            return ids;
-        }
-
-        /// <summary>
-        /// Download an individual pack
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to access the packs</param>
-        /// <param name="url">Base URL to download using</param>
-        /// <param name="system">System to download packs for</param>
-        /// <param name="title">Name of the pack that is downloading</param>
-        private byte[] DownloadPack(CookieAwareWebClient wc, string url, RedumpSystem system, string title)
-        {
-            Console.WriteLine($"Downloading {title}");
-            Console.Write($"\r{system.LongName()}{new string(' ', Console.BufferWidth - system.LongName().Length - 1)}");
-            var pack = wc.DownloadData(string.Format(url, system.ShortName()));
-
-            Console.Write($"\rComplete!{new string(' ', Console.BufferWidth - 10)}");
-            Console.WriteLine();
-
-            return pack;
-        }
-
-        /// <summary>
-        /// Download a set of packs
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to access the packs</param>
-        /// <param name="url">Base URL to download using</param>
-        /// <param name="systems">List of systems to download packs for</param>
-        /// <param name="title">Name of the pack that is downloading</param>
-        private Dictionary<RedumpSystem, byte[]> DownloadPacks(CookieAwareWebClient wc, string url, RedumpSystem[] systems, string title)
-        {
-            var dict = new Dictionary<RedumpSystem, byte[]>();
-
-            Console.WriteLine($"Downloading {title}");
-            foreach (var system in systems)
-            {
-                Console.Write($"\r{system.LongName()}{new string(' ', Console.BufferWidth - system.LongName().Length - 1)}");
-                dict.Add(system, wc.DownloadData(string.Format(url, system.ShortName())));
-            }
-
-            Console.Write($"\rComplete!{new string(' ', Console.BufferWidth - 10)}");
-            Console.WriteLine();
-
-            return dict;
-        }
-
-        /// <summary>
-        /// Download an individual site ID page as a string, if possible
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to access the pages</param>
-        /// <param name="id">Redump disc ID to retrieve</param>
-        /// <returns>Disc page as a string, null on error</returns>
-        public string DownloadSingleSiteID(CookieAwareWebClient wc, int id)
-        {
-            string paddedId = id.ToString().PadLeft(5, '0');
-            Console.WriteLine($"Processing ID: {paddedId}");
-            try
-            {
-                string discPage = wc.DownloadString(string.Format(discPageUrl, +id));
-                if (discPage.Contains($"Disc with ID \"{id}\" doesn't exist"))
-                    return null;
-                else
-                    return discPage;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"An exception has occurred: {ex}");
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Download an individual WIP ID page as a string, if possible
-        /// </summary>
-        /// <param name="wc">CookieAwareWebClient to access the pages</param>
-        /// <param name="id">Redump disc ID to retrieve</param>
-        /// <returns>WIP disc page as a string, null on error</returns>
-        private string DownloadSingleWIPID(CookieAwareWebClient wc, int id)
-        {
-            string paddedId = id.ToString().PadLeft(5, '0');
-            Console.WriteLine($"Processing WIP ID: {paddedId}");
-            try
-            {
-                string discPage = wc.DownloadString(string.Format(wipDiscPageUrl, +id));
-                if (discPage.Contains($"WIP Disc with ID \"{id}\" doesn't exist"))
-                    return null;
-                else
-                    return discPage;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"An exception has occurred: {ex}");
-                return null;
-            }
-        }
-
-        #endregion
-    }
-}

DICUI/ComboBoxItems/CategoryComboBoxItem.cs

@@ -1,5 +1,5 @@
-using DICUI.Data;
-using DICUI.Utilities;
+using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI
 {

DICUI/ComboBoxItems/LanguageComboBoxItem.cs

@@ -1,5 +1,5 @@
-using DICUI.Data;
-using DICUI.Utilities;
+using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI
 {

DICUI/ComboBoxItems/RegionComboBoxItem.cs

@@ -1,5 +1,5 @@
-using DICUI.Data;
-using DICUI.Utilities;
+using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI
 {

DICUI/Windows/DiscInformationWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using DICUI.Data;
+using DICUI.Web;
 
 namespace DICUI.Windows
 {

DICUI/Windows/MainWindow.xaml.cs

@@ -261,7 +261,7 @@ namespace DICUI.Windows
             string version = $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.MajorRevision != 0 ? $".{assemblyVersion.MajorRevision}" : string.Empty);
 
             // Get the latest tag from GitHub
-            using (var client = new CookieAwareWebClient())
+            using (var client = new RedumpWebClient())
             {
                 client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:64.0) Gecko/20100101 Firefox/64.0";
 

DICUI/Windows/OptionsWindow.xaml.cs

@@ -123,10 +123,9 @@ namespace DICUI.Windows
         /// </summary>
         private void OnRedumpTestClick(object sender, EventArgs e)
         {
-            using (CookieAwareWebClient wc = new CookieAwareWebClient())
+            using (RedumpWebClient wc = new RedumpWebClient())
             {
-                RedumpAccess access = new RedumpAccess();
-                if (access.RedumpLogin(wc, RedumpUsernameTextBox.Text, RedumpPasswordBox.Password))
+                if (wc.Login(RedumpUsernameTextBox.Text, RedumpPasswordBox.Password))
                     System.Windows.MessageBox.Show("Redump login credentials accepted!", "Success", MessageBoxButton.OK, MessageBoxImage.Information);
                 else
                     System.Windows.MessageBox.Show("Redump login credentials denied!", "Failure", MessageBoxButton.OK, MessageBoxImage.Error);