#137 Proxy support with reworked CookieClient, Parser's and some init…

…alization code.
MonkAlex · May 12, 2019 · b3fbdf2 · b3fbdf2
1 parent b92d050
commit b3fbdf2
Show file tree

Hide file tree

Showing 45 changed files with 499 additions and 148 deletions.
diff --git a/MangaReader.Core/Account/CookieClient.cs b/MangaReader.Core/Account/CookieClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Net;
 using System.Text;
+using MangaReader.Core.Services;
 
 namespace MangaReader.Core.Account
 {
@@ -33,16 +34,10 @@ protected override WebResponse GetWebResponse(WebRequest request, IAsyncResult r
       return baseResponce;
     }
 
-    public CookieClient() : this(new CookieContainer())
-    {
-
-    }
-
-    public CookieClient(CookieContainer cookie)
+    protected CookieClient()
     {
+      this.Cookie = new CookieContainer();
       this.Encoding = Encoding.UTF8;
-      this.Proxy = SystemProxySetting.SystemProxy.Value;
-      this.Cookie = cookie;
       Headers[HttpRequestHeader.UserAgent] = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:57.0) Gecko/20100101 Firefox/57.0";
     }
   }

diff --git a/MangaReader.Core/Account/IProxySetting.cs b/MangaReader.Core/Account/IProxySetting.cs
diff --git a/MangaReader.Core/Account/Login.cs b/MangaReader.Core/Account/Login.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using MangaReader.Core.Manga;
 using MangaReader.Core.Services;
+using MangaReader.Core.Services.Config;
 
 namespace MangaReader.Core.Account
 {
@@ -39,10 +40,7 @@ public bool IsLogined
     /// </summary>
     protected internal CookieContainer ClientCookie { get; set; }
 
-    protected internal CookieClient GetClient()
-    {
-      return new CookieClient(this.ClientCookie) { BaseAddress = MainUri.ToString() };
-    }
+    protected internal abstract CookieClient GetClient();
 
     private bool isLogined;
 

diff --git a/MangaReader.Core/Account/ProxySetting.cs b/MangaReader.Core/Account/ProxySetting.cs
@@ -3,8 +3,15 @@
 
 namespace MangaReader.Core.Account
 {
-  public class ProxySetting : Entity.Entity, IProxySetting
+  public class ProxySetting : Entity.Entity
   {
+    internal static readonly Lazy<IWebProxy> SystemProxy = new Lazy<IWebProxy>(() =>
+    {
+      var proxy = WebRequest.GetSystemWebProxy();
+      proxy.Credentials = CredentialCache.DefaultCredentials;
+      return proxy;
+    });
+
     public string Name { get; set; }
 
     public Uri Address { get; set; }
@@ -13,10 +20,38 @@ public class ProxySetting : Entity.Entity, IProxySetting
 
     public string Password { get; set; }
 
+    public ProxySettingType SettingType { get; set; }
+
     public virtual IWebProxy GetProxy()
     {
-      var proxy = new WebProxy(Address, true, null, new NetworkCredential(UserName, Password));
-      return proxy;
+      switch (SettingType)
+      {
+        case ProxySettingType.NoProxy:
+          return null;
+        case ProxySettingType.System:
+          return SystemProxy.Value;
+        case ProxySettingType.Manual:
+          return new WebProxy(Address, true, null, new NetworkCredential(UserName, Password));
+        default:
+          throw new ArgumentOutOfRangeException();
+      }
+    }
+
+    protected ProxySetting()
+    {
+      this.SettingType = ProxySettingType.NoProxy;
+    }
+
+    public ProxySetting(ProxySettingType settingType)
+    {
+      this.SettingType = settingType;
     }
   }
+
+  public enum ProxySettingType
+  {
+    NoProxy,
+    System,
+    Manual
+  }
 }
diff --git a/MangaReader.Core/Account/SystemProxySetting.cs b/MangaReader.Core/Account/SystemProxySetting.cs
diff --git a/MangaReader.Core/BaseSiteParser.cs b/MangaReader.Core/BaseSiteParser.cs
@@ -110,17 +110,18 @@ protected void FillMangaPages(IManga manga, ICollection<MangaPageDto> pages)
 
     public virtual IAsyncEnumerable<IManga> Search(string name)
     {
-      var client = new CookieClient();
       var hosts = ConfigStorage.Plugins
         .Where(p => p.GetParser().GetType() == this.GetType())
         .Select(p => p.GetSettings().MainUri);
-      return hosts.SelectAsync(async host => await GetMangaNodes(name, host, client).ConfigureAwait(false))
-        .Where(nc => nc != null && nc.Item1 != null)
-        .SelectMany(n => n.Item1.SelectAsync(node => GetMangaFromNode(n.Item2, client, node)))
+      return hosts.SelectAsync(async host => await GetMangaNodes(name, host).ConfigureAwait(false))
+        .Where(nc => nc.Nodes != null)
+        .SelectMany(n => n.Nodes.SelectAsync(node => GetMangaFromNode(n.Uri, n.CookieClient, node)))
         .Where(m => m != null);
     }
 
-    protected abstract Task<Tuple<HtmlNodeCollection, Uri>> GetMangaNodes(string name, Uri host, CookieClient client);
+    public abstract CookieClient GetClient();
+
+    protected abstract Task<(HtmlNodeCollection Nodes, Uri Uri, CookieClient CookieClient)> GetMangaNodes(string name, Uri host);
 
     protected abstract Task<IManga> GetMangaFromNode(Uri host, CookieClient client, HtmlNode manga);
 
@@ -142,4 +143,4 @@ public virtual IMapper GetMapper()
       });
     }
   }
-}
+}
diff --git a/MangaReader.Core/Convertation/Config/From47To48.cs b/MangaReader.Core/Convertation/Config/From47To48.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using MangaReader.Core.Account;
+using MangaReader.Core.Convertation.Primitives;
+using MangaReader.Core.NHibernate;
+using MangaReader.Core.Services;
+
+namespace MangaReader.Core.Convertation.Config
+{
+  public class From47To48 : ConfigConverter
+  {
+    protected override async Task ProtectedConvert(IProcess process)
+    {
+      using (var context = Repository.GetEntityContext())
+      {
+        var proxySetting = await context
+          .Get<ProxySetting>()
+          .Where(s => s.SettingType == ProxySettingType.System)
+          .SingleAsync().ConfigureAwait(false);
+        var settings = await context.Get<MangaSetting>().Where(s => s.ProxySetting == null).ToListAsync().ConfigureAwait(false);
+        foreach (var setting in settings)
+        {
+          setting.ProxySetting = proxySetting;
+        }
+
+        await settings.SaveAll(context).ConfigureAwait(false);
+      }
+    }
+
+    public From47To48()
+    {
+      this.Name = "Поддержка прокси";
+      this.Version = new Version(1, 48, 0);
+    }
+  }
+}
diff --git a/MangaReader.Core/Convertation/Primitives/BaseConverter.cs b/MangaReader.Core/Convertation/Primitives/BaseConverter.cs
@@ -25,9 +25,9 @@ public async Task Convert(IProcess process)
     {
       if (this.CanConvert(process))
       {
-        Log.AddFormat("Converter '{0}{1}' started", this.Name, this.Version);
+        Log.AddFormat("Converter '{0} {1}' started", this.Name, this.Version);
         await this.ProtectedConvert(process).ConfigureAwait(false);
-        Log.AddFormat("Converter '{0}{1}' completed", this.Name, this.Version);
+        Log.AddFormat("Converter '{0} {1}' completed", this.Name, this.Version);
       }
     }
 

diff --git a/MangaReader.Core/ISiteParser.cs b/MangaReader.Core/ISiteParser.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using MangaReader.Core.Account;
 using MangaReader.Core.Manga;
 
 namespace MangaReader.Core
@@ -50,6 +51,12 @@ public interface ISiteParser
     /// <param name="name">Название манги.</param>
     /// <returns>Найденная манга.</returns>
     IAsyncEnumerable<IManga> Search(string name);
+
+    /// <summary>
+    /// Клиент для работы с сайтом.
+    /// </summary>
+    /// <returns></returns>
+    CookieClient GetClient();
   }
 
   public class UriParseResult
@@ -75,4 +82,4 @@ public enum UriParseKind
     Chapter = 2,
     Page = 3
   }
-}
+}
diff --git a/MangaReader.Core/Manga/Mangas.cs b/MangaReader.Core/Manga/Mangas.cs
@@ -490,7 +490,7 @@ public override async Task BeforeSave(ChangeTrackerArgs args)
           debugMessage += $" uri changed from '{uriState.OldValue}' to '{uriState.Value}'";
           using (Repository.GetEntityContext("Manga uri changed"))
           {
-            var settings = ConfigStorage.Plugins.Where(p => p.GetParser().GetType() == Parser.GetType()).Select(p => p.GetSettings());
+            var settings = ConfigStorage.Plugins.Where(p => p.LoginType == this.Setting.Login.GetType()).Select(p => p.GetSettings());
             var allowedUris = settings.Select(s => s.MainUri).ToList();
             if (allowedUris.Any(s => s.Host == uriState.OldValue.Host) &&
                 allowedUris.All(s => s.Host != uriState.Value.Host))

diff --git a/MangaReader.Core/NHibernate/MangaSettingMap.cs b/MangaReader.Core/NHibernate/MangaSettingMap.cs
@@ -18,6 +18,7 @@ public MangaSettingMap()
       Map(x => x.MainUri);
       Map(x => x.FolderNamingStrategy);
       References(x => x.Login).Cascade.All().NotFound.Ignore();
+      References(x => x.ProxySetting);
     }
   }
 }
diff --git a/MangaReader.Core/NHibernate/ProxySettingMap.cs b/MangaReader.Core/NHibernate/ProxySettingMap.cs
@@ -0,0 +1,19 @@
+using FluentNHibernate.Mapping;
+using MangaReader.Core.Account;
+
+namespace MangaReader.Core.NHibernate
+{
+  public class ProxySettingMap : ClassMap<ProxySetting>
+  {
+    public ProxySettingMap()
+    {
+      Not.LazyLoad();
+      Id(x => x.Id);
+      Map(x => x.Name);
+      Map(x => x.UserName);
+      Map(x => x.Password);
+      Map(x => x.SettingType);
+      Map(x => x.Address);
+    }
+  }
+}
diff --git a/MangaReader.Core/Services/CallContext.cs b/MangaReader.Core/Services/CallContext.cs
@@ -0,0 +1,25 @@
+using System.Collections.Concurrent;
+using System.Threading;
+
+namespace MangaReader.Core.Services
+{
+  public static class CallContext<T>
+  {
+    private static readonly ConcurrentDictionary<string, AsyncLocal<T>> State = new ConcurrentDictionary<string, AsyncLocal<T>>();
+
+    public static void SetData(string name, T data)
+    {
+      State.AddOrUpdate(name, new AsyncLocal<T>(), (_, __) => new AsyncLocal<T>()).Value = data;
+    }
+
+    public static T GetData(string name)
+    {
+      return State.TryGetValue(name, out AsyncLocal<T> data) ? data.Value : default(T);
+    }
+
+    public static bool RemoveData(string name)
+    {
+      return State.TryRemove(name, out _);
+    }
+  }
+}
diff --git a/MangaReader.Core/Services/Config/DatabaseConfig.cs b/MangaReader.Core/Services/Config/DatabaseConfig.cs
@@ -59,12 +59,32 @@ private static async Task CreateDefaultMangaSettings(RepositoryContext context)
           Manga = plugin.MangaGuid,
           MangaName = plugin.Name,
           DefaultCompression = Compression.CompressionMode.Manga,
+          ProxySetting = await context.Get<ProxySetting>().SingleAsync(s => s.SettingType == ProxySettingType.System).ConfigureAwait(false),
           Login = await Login.Get(plugin.LoginType).ConfigureAwait(false)
         };
 
         await context.Save(setting).ConfigureAwait(false);
         settings.Add(setting);
       }
+
+      foreach (var setting in settings)
+      {
+        MangaSettingCache.Set(new MangaSettingCache(setting));
+      }
+    }
+
+    private static async Task CreateDefaultProxySettings(RepositoryContext context)
+    {
+      var types = new[] { ProxySettingType.NoProxy, ProxySettingType.System };
+      foreach (var settingType in types)
+      {
+        if (!await context.Get<ProxySetting>().AnyAsync(s => s.SettingType == settingType)
+          .ConfigureAwait(false))
+        {
+          var noProxy = new ProxySetting(settingType);
+          await context.Save(noProxy).ConfigureAwait(false);
+        }
+      }
     }
 
     public DatabaseConfig()
@@ -77,7 +97,10 @@ public static async Task Initialize()
     {
       await Repository.GetStateless<DatabaseConfig>().SingleOrCreate().ConfigureAwait(false);
       using (var context = Repository.GetEntityContext("Initialize database config"))
+      {
+        await CreateDefaultProxySettings(context).ConfigureAwait(false);
         await CreateDefaultMangaSettings(context).ConfigureAwait(false);
+      }
     }
   }
-}
+}
diff --git a/MangaReader.Core/Services/MangaSetting.cs b/MangaReader.Core/Services/MangaSetting.cs
@@ -39,6 +39,11 @@ public class MangaSetting : Entity.Entity
     /// </summary>
     public Guid FolderNamingStrategy { get; set; }
 
+    /// <summary>
+    /// Настройки прокси.
+    /// </summary>
+    public ProxySetting ProxySetting { get; set; }
+
     public override async Task BeforeSave(ChangeTrackerArgs args)
     {
       if (!DirectoryHelpers.ValidateSettingPath(this.Folder))