Merge branch 'develop2'

MailRuCloud/MailRuCloudApi/Base/Account.cs

@@ -9,13 +9,6 @@ namespace YaR.MailRuCloud.Api.Base
     //TODO: refact, Requestrepo - wrong place?
     public class Account
     {
-        private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(typeof(Account));
-
-        /// <summary>
-        /// Default cookies.
-        /// </summary>
-        private CookieContainer _cookies;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Account" /> class.
         /// </summary>
@@ -24,25 +17,18 @@ public Account(CloudSettings settings, Credentials credentials)
             Credentials = credentials;
 
             WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultCredentials;
-            Proxy = WebRequest.DefaultWebProxy;
 
-            RequestRepo = new RepoFabric(settings, credentials, Proxy)
+            RequestRepo = new RepoFabric(settings, credentials)
                 .Create();
         }
 
         internal IRequestRepo RequestRepo { get; }
-
-        /// <summary>
-        /// Gets connection proxy.
-        /// </summary>
-        /// <value>Proxy settings.</value>
-        public IWebProxy Proxy { get; }
-
+
         /// <summary>
         /// Gets account cookies.
         /// </summary>
         /// <value>Account cookies.</value>
-        public CookieContainer Cookies => _cookies ?? (_cookies = new CookieContainer());
+        //public CookieContainer Cookies => _cookies ?? (_cookies = new CookieContainer());
 
         internal Credentials Credentials { get; }
 

MailRuCloud/MailRuCloudApi/Base/CryptInfo.cs

@@ -2,7 +2,7 @@
 {
     public class CryptInfo
     {
-        public const uint HeaderSize = 1024;
+        //public const uint HeaderSize = 1024;
         public uint AlignBytes { get; set; }
         public CryptoKeyInfo PublicKey { get; set; }
     }

MailRuCloud/MailRuCloudApi/Base/FilenameServiceInfo.cs

@@ -10,7 +10,7 @@ public class FilenameServiceInfo
         public bool IsCrypted => CryptInfo != null;
         public CryptInfo CryptInfo { get; set; }
 
-        public bool IsSplitted => SplitInfo != null;
+        //public bool IsSplitted => SplitInfo != null;
         public FileSplitInfo SplitInfo { get; set; }
 
         public override string ToString()

MailRuCloud/MailRuCloudApi/Base/Repos/MobileRequestRepo.cs

@@ -3,7 +3,6 @@
 using System.IO;
 using System.Net;
 using System.Net.Mime;
-using System.Security.Authentication;
 using System.Threading.Tasks;
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests;
@@ -37,7 +36,7 @@ public MobileRequestRepo(IWebProxy proxy, IAuth auth, int listDepth)
 
             Authent = auth;
 
-            _metaServer = new Cached<MobMetaServerRequest.Result>(old =>
+            _metaServer = new Cached<ServerRequest.Result>(old =>
                 {
                     Logger.Debug("MetaServer expired, refreshing.");
                     var server = new MobMetaServerRequest(HttpSettings).MakeRequestAsync().Result;
@@ -57,7 +56,7 @@ public MobileRequestRepo(IWebProxy proxy, IAuth auth, int listDepth)
 
 
 
-        private readonly Cached<MobMetaServerRequest.Result> _metaServer;
+        private readonly Cached<ServerRequest.Result> _metaServer;
         private const int MetaServerExpiresSec = 20 * 60;
 
         private readonly Cached<ServerRequest.Result> _downloadServer;

MailRuCloud/MailRuCloudApi/Base/Repos/RepoFabric.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 
 namespace YaR.MailRuCloud.Api.Base.Repos
 {
@@ -9,13 +8,11 @@ class RepoFabric
 
         private readonly CloudSettings _settings;
         private readonly Credentials _credentials;
-        private readonly IWebProxy _proxy;
 
-        public RepoFabric(CloudSettings settings, Credentials credentials, IWebProxy proxy)
+        public RepoFabric(CloudSettings settings, Credentials credentials)
         {
             _settings = settings;
             _credentials = credentials;
-            _proxy = proxy;
         }
 
         public IRequestRepo Create()
@@ -32,10 +29,10 @@ string TwoFaHandler(string login, bool isAutoRelogin)
             switch (_settings.Protocol)
             {
                 case Protocol.WebM1Bin:
-                    repo = new WebM1RequestRepo(_proxy, _credentials, TwoFaHandler, _settings.ListDepth);
+                    repo = new WebM1RequestRepo(_settings.Proxy, _credentials, TwoFaHandler, _settings.ListDepth);
                     break;
                 case Protocol.WebV2:
-                    repo = new WebV2RequestRepo(_proxy, _credentials, TwoFaHandler);
+                    repo = new WebV2RequestRepo(_settings.Proxy, _credentials, TwoFaHandler);
                     break;
                 default:
                     throw new Exception("Unknown protocol");

MailRuCloud/MailRuCloudApi/Base/Repos/ShardManager.cs

@@ -3,9 +3,7 @@
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests;
 using YaR.MailRuCloud.Api.Base.Requests.Types;
-using YaR.MailRuCloud.Api.Base.Requests.WebM1;
 using YaR.MailRuCloud.Api.Common;
-using YaR.MailRuCloud.Api.Extensions;
 
 namespace YaR.MailRuCloud.Api.Base.Repos
 {
@@ -17,7 +15,7 @@ class ShardManager
 
         public ShardManager(HttpCommonSettings httpsettings, IAuth auth, IRequestRepo repo)
         {
-            _metaServer = new Cached<Requests.WebBin.MobMetaServerRequest.Result>(old =>
+            _metaServer = new Cached<Requests.WebBin.ServerRequest.Result>(old =>
                 {
                     Logger.Debug("Requesting new meta server");
                     var server = new Requests.WebBin.MobMetaServerRequest(httpsettings).MakeRequestAsync().Result;
@@ -60,7 +58,7 @@ public ShardManager(HttpCommonSettings httpsettings, IAuth auth, IRequestRepo re
         public Pending<Cached<Requests.WebBin.ServerRequest.Result>> WeblinkDownloadServersPending { get; }
 
         public ShardInfo MetaServer => new ShardInfo {Url = _metaServer.Value.Url, Count = _metaServer.Value.Unknown};
-        private readonly Cached<Requests.WebBin.MobMetaServerRequest.Result> _metaServer;
+        private readonly Cached<Requests.WebBin.ServerRequest.Result> _metaServer;
 
         public Cached<Dictionary<ShardType, ShardInfo>> CachedShards { get; }
 

MailRuCloud/MailRuCloudApi/Base/Repos/WebM1RequestRepo.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Net;
 using System.Net.Mime;
-using System.Security.Authentication;
 using System.Threading;
 using System.Threading.Tasks;
 using YaR.MailRuCloud.Api.Base.Auth;
@@ -25,7 +24,6 @@ class WebM1RequestRepo : IRequestRepo
         private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(typeof(WebV2RequestRepo));
         private readonly IBasicCredentials _creds;
         private readonly AuthCodeRequiredDelegate _onAuthCodeRequired;
-        private readonly int _listDepth;
 
         protected ShardManager ShardManager => _shardManager ?? (_shardManager = new ShardManager(HttpSettings, Authent, this));
         private ShardManager _shardManager;
@@ -46,7 +44,6 @@ public WebM1RequestRepo(IWebProxy proxy, IBasicCredentials creds, AuthCodeRequir
         {
             _creds = creds;
             _onAuthCodeRequired = onAuthCodeRequired;
-            _listDepth = listDepth;
 
 			ServicePointManager.DefaultConnectionLimit = int.MaxValue;
 

MailRuCloud/MailRuCloudApi/Base/Requests/BaseRequestJson.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Net;
 using Newtonsoft.Json;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/BaseRequestString.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using YaR.MailRuCloud.Api.Base.Auth;
+using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests
 {

MailRuCloud/MailRuCloudApi/Base/Requests/BaseRequestStringT.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests

MailRuCloud/MailRuCloudApi/Base/Requests/ResolveFileConflictMethod.cs

@@ -16,7 +16,7 @@ private ConflictResolver(string value)
 
         public override bool Equals(object obj)
         {
-            return obj is ConflictResolver && Equals((ConflictResolver)obj);
+            return obj is ConflictResolver resolver && Equals(resolver);
         }
 
         public bool Equals(ConflictResolver other)

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/AccountInfoRequest.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using YaR.MailRuCloud.Api.Base.Auth;
+using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
 {

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/BaseRequestMobile.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests.WebBin.Types;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/GetServerRequest.cs

@@ -1,6 +1,4 @@
-using System.Net;
-
-namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
+namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
 {
     internal class GetServerRequest : ServerRequest
     {

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/MobAddFileRequest.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests.WebBin.Types;
 using YaR.MailRuCloud.Api.Extensions;

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/MobMetaServerRequest.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
+namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
 {
     internal class MobMetaServerRequest : ServerRequest
     {

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/OAuthSecondStepRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebBin

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/ServerRequest.cs

@@ -4,7 +4,7 @@ namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
 {
     internal abstract class ServerRequest : BaseRequestString<ServerRequest.Result>
     {
-        public ServerRequest(HttpCommonSettings settings) : base(settings, null)
+        protected ServerRequest(HttpCommonSettings settings) : base(settings, null)
         {
         }
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/SharedFoldersListRequest.cs

@@ -56,7 +56,7 @@ protected override RequestResponse<Result> DeserializeMessage(ResponseBodyStream
                     }
                     break;
                 default:
-                    throw new Exception($"{nameof(SharedFoldersListRequest)}: Unknown parse operation {opres}"); ;
+                    throw new Exception($"{nameof(SharedFoldersListRequest)}: Unknown parse operation {opres}");
             }
 
             return new RequestResponse<Result>

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/Types/RequestBodyStream.cs

@@ -13,7 +13,7 @@ public void WritePu16(int value)
             if (value < 0 || (long)value > 65535)
                 throw new Exception("Invalid PU16 " + value);
 
-            WritePu32((long)value);
+            WritePu32(value);
         }
 
         public void WritePu32(long value)
@@ -34,7 +34,7 @@ public void WritePu32(long value)
         public void WriteString(String value)
         {
             byte[] bytes = Encoding.UTF8.GetBytes(value);
-            WritePu32((long)(bytes.Length + 1));
+            WritePu32(bytes.Length + 1);
             _stream.Write(bytes, 0, bytes.Length);
             _stream.WriteByte(00);
         }

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/Types/ResponseBodyStream.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
 using YaR.MailRuCloud.Api.Extensions;

MailRuCloud/MailRuCloudApi/Base/Requests/WebBin/WeblinkGetServerRequest.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Net;
-
-namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
+namespace YaR.MailRuCloud.Api.Base.Requests.WebBin
 {
     internal class WeblinkGetServerRequest : ServerRequest
     {

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/AccountInfoRequest.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using YaR.MailRuCloud.Api.Base.Auth;
+using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebM1
 {

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/CloneItemRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebM1

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/CreateFileRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/CreateFolderRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/FolderInfoRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests.Types;

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/ItemInfoRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests.Types;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/MoveRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/PublishRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/RemoveRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/RenameRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/ShardInfoRequest.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Net;
-using YaR.MailRuCloud.Api.Base.Auth;
+using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebM1
 {

MailRuCloud/MailRuCloudApi/Base/Requests/WebM1/UnpublishRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebV2/AccountInfoRequest.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 using YaR.MailRuCloud.Api.Base.Requests.Types;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebV2/AuthTokenRequest.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using YaR.MailRuCloud.Api.Base.Auth;
+using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebV2
 {

MailRuCloud/MailRuCloudApi/Base/Requests/WebV2/CloneItemRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using YaR.MailRuCloud.Api.Base.Auth;
 
 namespace YaR.MailRuCloud.Api.Base.Requests.WebV2

MailRuCloud/MailRuCloudApi/Base/Requests/WebV2/CopyRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;
 

MailRuCloud/MailRuCloudApi/Base/Requests/WebV2/CreateFileRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Text;
 using YaR.MailRuCloud.Api.Base.Auth;