Merge branch 'develop'

yar229 · Sep 12, 2017 · f9877dc · f9877dc
2 parents db6ebb5 + a9a6571
commit f9877dc
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 69 deletions.
diff --git a/MailRuNetCloudClient b/MailRuNetCloudClient
diff --git a/WDMRC.2FA/AuthCodeConsole.cs b/WDMRC.2FA/AuthCodeConsole.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MailRuCloudApi.TwoFA
 {

diff --git a/WDMRC.2FA/AuthCodeForm.cs b/WDMRC.2FA/AuthCodeForm.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace MailRuCloudApi.TwoFA
 {

diff --git a/WDMRC.2FA/AuthCodeWindow.cs b/WDMRC.2FA/AuthCodeWindow.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Drawing;
 using System.Windows.Forms;
 
 namespace MailRuCloudApi.TwoFA
@@ -16,23 +10,23 @@ public AuthCodeWindow()
 
         public string Get(string login, bool isAutoRelogin)
         {
-            string result = string.Empty;
-
             Application.EnableVisualStyles();
 
             using (NotifyIcon notify = new NotifyIcon())
             using (AuthCodeForm prompt = new AuthCodeForm())
             {
+                var prompt1 = prompt;
+
                 notify.Visible = true;
                 notify.Icon = SystemIcons.Exclamation;
                 notify.BalloonTipTitle = "WebDAV Mail.Ru 2 Factor Auth";
                 notify.BalloonTipText = $"Auth code required for {login}";
                 notify.BalloonTipIcon = ToolTipIcon.Info;
 
-                notify.Click += (sender, args) => 
-                    prompt?.Activate();
-                notify.BalloonTipClicked += (sender, args) => 
-                    prompt?.Activate();
+                notify.Click += (sender, args) =>
+                    prompt1?.Activate();
+                notify.BalloonTipClicked += (sender, args) =>
+                    prompt1?.Activate();
 
                 notify.ShowBalloonTip(30000);
 

diff --git a/WDMRC.Console/Properties/AssemblyInfo.cs b/WDMRC.Console/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.1.3")]
-[assembly: AssemblyFileVersion("1.6.1.3")]
+[assembly: AssemblyVersion("1.6.1.4")]
+[assembly: AssemblyFileVersion("1.6.1.4")]
 
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
diff --git a/WebDavMailRuCloudStore/Cloud.cs b/WebDavMailRuCloudStore/Cloud.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Concurrent;
-using System.Configuration;
 using System.Linq;
 using System.Net;
-using System.Runtime.CompilerServices;
 using MailRuCloudApi;
 using MailRuCloudApi.Api;
-using NWebDav.Server.Handlers;
 using NWebDav.Server.Http;
 
 namespace YaR.WebDavMailRu.CloudStore
@@ -30,8 +27,7 @@ public static MailRuCloud Instance(IHttpContext context)
             HttpListenerBasicIdentity identity = (HttpListenerBasicIdentity)context.Session.Principal.Identity;
             string key = identity.Name + identity.Password;
 
-            MailRuCloud cloud;
-            if (CloudCache.TryGetValue(key, out cloud))
+            if (CloudCache.TryGetValue(key, out var cloud))
             {
                 if (cloud.CloudApi.Account.Expires <= DateTime.Now)
                     CloudCache.TryRemove(key, out cloud);

diff --git a/WebDavMailRuCloudStore/Extensions.cs b/WebDavMailRuCloudStore/Extensions.cs
@@ -14,11 +14,9 @@ public static Task<bool> Remove(this MailRuCloud cloud, IStoreItem item)
         {
             if (null == item) return Task.FromResult(false);
 
-            var storeItem = item as MailruStoreItem;
-            if (storeItem != null)
+            if (item is MailruStoreItem storeItem)
                 return cloud.Remove(storeItem.FileInfo);
-            var storeCollection = item as MailruStoreCollection;
-            if (storeCollection != null)
+            if (item is MailruStoreCollection storeCollection)
                 return cloud.Remove(storeCollection.DirectoryInfo);
 
             throw new ArgumentException(string.Empty, nameof(item));
@@ -28,11 +26,9 @@ public static Task<bool> Rename(this MailRuCloud cloud, IStoreItem item, string
         {
             if (null == item) return Task.FromResult(false);
 
-            var storeItem = item as MailruStoreItem;
-            if (storeItem != null)
+            if (item is MailruStoreItem storeItem)
                 return cloud.Rename(storeItem.FileInfo, destinationName);
-            var storeCollection = item as MailruStoreCollection;
-            if (storeCollection != null)
+            if (item is MailruStoreCollection storeCollection)
                 return cloud.Rename(storeCollection.DirectoryInfo, destinationName);
 
             throw new ArgumentException(string.Empty, nameof(item));
@@ -42,11 +38,9 @@ public static Task<bool> Move(this MailRuCloud cloud, IStoreItem item, string de
         {
             if (null == item) return Task.FromResult(false);
 
-            var storeItem = item as MailruStoreItem;
-            if (storeItem != null)
+            if (item is MailruStoreItem storeItem)
                 return cloud.Move(storeItem.FileInfo, destinationName);
-            var storeCollection = item as MailruStoreCollection;
-            if (storeCollection != null)
+            if (item is MailruStoreCollection storeCollection)
                 return cloud.Move(storeCollection.DirectoryInfo, destinationName);
 
             throw new ArgumentException(string.Empty, nameof(item));
@@ -56,11 +50,9 @@ public static string GetFullPath(this IStoreItem item)
         {
             if (null == item) return string.Empty;
 
-            var storeItem = item as MailruStoreItem;
-            if (storeItem != null)
+            if (item is MailruStoreItem storeItem)
                 return storeItem.FullPath;
-            var storeCollection = item as MailruStoreCollection;
-            if (storeCollection != null)
+            if (item is MailruStoreCollection storeCollection)
                 return storeCollection.FullPath;
 
             throw new ArgumentException(string.Empty, nameof(item));
@@ -69,9 +61,7 @@ public static string GetFullPath(this IStoreItem item)
 
         public static long ContentLength(this IHttpRequest request)
         {
-            long res;
-            long.TryParse(request.GetHeaderValue("Content-Length"), out res);
-
+            long.TryParse(request.GetHeaderValue("Content-Length"), out var res);
             return res;
         }
 

diff --git a/WebDavMailRuCloudStore/Mailru/RequestHandlerFactory.cs b/WebDavMailRuCloudStore/Mailru/RequestHandlerFactory.cs
@@ -24,8 +24,7 @@ public class RequestHandlerFactory : IRequestHandlerFactory
 
         public IRequestHandler GetRequestHandler(IHttpContext httpContext)
         {
-            IRequestHandler requestHandler;
-            if (!RequestHandlers.TryGetValue(httpContext.Request.HttpMethod, out requestHandler))
+            if (!RequestHandlers.TryGetValue(httpContext.Request.HttpMethod, out var requestHandler))
                 return null;
 
             return requestHandler;

diff --git a/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs b/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs
@@ -383,9 +383,7 @@ public async Task<StoreItemResult> MoveItemAsync(string sourceName, IStoreCollec
                 return new StoreItemResult(DavStatusCode.NotFound);
 
 
-            var destinationStoreCollection = destinationCollection as MailruStoreCollection;
-
-            if (destinationStoreCollection != null)
+            if (destinationCollection is MailruStoreCollection destinationStoreCollection)
             {
                 if (!destinationStoreCollection.IsWritable)
                     return new StoreItemResult(DavStatusCode.PreconditionFailed);
@@ -482,8 +480,7 @@ public override int GetHashCode()
 
         public override bool Equals(object obj)
         {
-            var storeCollection = obj as MailruStoreCollection;
-            if (storeCollection == null)
+            if (!(obj is MailruStoreCollection storeCollection))
                 return false;
             return storeCollection._directoryInfo.FullPath.Equals(_directoryInfo.FullPath, StringComparison.CurrentCultureIgnoreCase);
         }

diff --git a/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreItem.cs b/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 using MailRuCloudApi;
@@ -223,8 +222,7 @@ public async Task<StoreItemResult> CopyAsync(IStoreCollection destination, strin
         {
             try
             {
-                var collection = destination as MailruStoreCollection;
-                if (collection != null)
+                if (destination is MailruStoreCollection collection)
                 {
                     if (!collection.IsWritable)
                         return new StoreItemResult(DavStatusCode.PreconditionFailed);
@@ -273,8 +271,7 @@ public override int GetHashCode()
 
         public override bool Equals(object obj)
         {
-            var storeItem = obj as MailruStoreItem;
-            if (storeItem == null)
+            if (!(obj is MailruStoreItem storeItem))
                 return false;
             return storeItem._fileInfo.FullPath.Equals(_fileInfo.FullPath, StringComparison.CurrentCultureIgnoreCase);
         }

diff --git a/WebDavMailRuCloudStore/TwoFaHandlers.cs b/WebDavMailRuCloudStore/TwoFaHandlers.cs
@@ -11,15 +11,15 @@ public static class TwoFaHandlers
     {
         static TwoFaHandlers()
         {
-            _handlerTypes = GetHandlers().ToList();
+            HandlerTypes = GetHandlers().ToList();
         }
 
-        private static List<Type> _handlerTypes;
+        private static readonly List<Type> HandlerTypes;
 
 
         public static ITwoFaHandler Get(string name)
         {
-            var type = _handlerTypes.FirstOrDefault(t => t.Name == name);
+            var type = HandlerTypes.FirstOrDefault(t => t.Name == name);
             if (null == type) return null;
 
             var inst = (ITwoFaHandler)Activator.CreateInstance(type);
@@ -28,7 +28,7 @@ public static ITwoFaHandler Get(string name)
 
         private static IEnumerable<Type> GetHandlers()
         {
-            foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(typeof(TwoFaHandlers).Assembly.Location), "MailRuCloudApi.TwoFA*.dll", SearchOption.TopDirectoryOnly))
+            foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(typeof(TwoFaHandlers).Assembly.Location) ?? throw new InvalidOperationException(), "MailRuCloudApi.TwoFA*.dll", SearchOption.TopDirectoryOnly))
             {
                 Assembly assembly = Assembly.LoadFile(file);
                 foreach (var type in assembly.ExportedTypes)
+4 −5		MailRuCloudApi/Api/Account.cs
+2 −3		MailRuCloudApi/Api/ConstSettings.cs
+1 −3		MailRuCloudApi/Api/DownloadStream.cs
+2 −8		MailRuCloudApi/Api/Requests/BaseRequest.cs
+1 −0		MailRuCloudApi/Api/Requests/LoginRequest.cs
+1 −1		MailRuCloudApi/Api/Requests/Types/LoginResult.cs
+5 −5		MailRuCloudApi/Entry.cs
+2 −2		MailRuCloudApi/Extensions/DtoImport.cs
+1 −2		MailRuCloudApi/Extensions/Extensions.cs
+5 −8		MailRuCloudApi/File.cs
+4 −4		MailRuCloudApi/Folder.cs
+0 −0		MailRuCloudApi/MailRuCloud.cs
+1 −1		MailRuCloudApi/MailRuCloudApi.csproj
+1 −1		MailRuCloudApi/SpecialCommands/SharedFolderLinkCommand.cs
+3 −1		MailRuCloudApi/SpecialCommands/SpecialCommandFabric.cs
+5 −5		MailRuCloudApi/SplittedFile.cs