Merge branch 'develop2'

yar229 · Jan 3, 2018 · 8daec9b · 8daec9b
2 parents 149f2f0 + f12784d
commit 8daec9b
Show file tree

Hide file tree

Showing 29 changed files with 370 additions and 259 deletions.
diff --git a/MailRuCloud/MailRuCloudApi/Base/Auth/OAuth.cs b/MailRuCloud/MailRuCloudApi/Base/Auth/OAuth.cs
@@ -4,6 +4,7 @@
 using YaR.MailRuCloud.Api.Base.Requests;
 using YaR.MailRuCloud.Api.Base.Requests.Types;
 using YaR.MailRuCloud.Api.Base.Requests.WebBin;
+using YaR.MailRuCloud.Api.Common;
 using YaR.MailRuCloud.Api.Extensions;
 
 namespace YaR.MailRuCloud.Api.Base.Auth

diff --git a/MailRuCloud/MailRuCloudApi/Base/Auth/WebAuth.cs b/MailRuCloud/MailRuCloudApi/Base/Auth/WebAuth.cs
@@ -5,6 +5,7 @@
 using YaR.MailRuCloud.Api.Base.Requests;
 using YaR.MailRuCloud.Api.Base.Requests.Types;
 using YaR.MailRuCloud.Api.Base.Requests.WebV2;
+using YaR.MailRuCloud.Api.Common;
 using YaR.MailRuCloud.Api.Extensions;
 
 namespace YaR.MailRuCloud.Api.Base.Auth

diff --git a/MailRuCloud/MailRuCloudApi/Base/Folder.cs b/MailRuCloud/MailRuCloudApi/Base/Folder.cs
@@ -30,8 +30,6 @@ public Folder(string fullPath)
         /// <summary>
         /// Initializes a new instance of the <see cref="Folder" /> class.
         /// </summary>
-        /// <param name="foldersCount">Number of folders.</param>
-        /// <param name="filesCount">Number of files.</param>
         /// <param name="size">Folder size.</param>
         /// <param name="fullPath">Full folder path.</param>
         /// <param name="publicLink">Public folder link.</param>
@@ -73,14 +71,7 @@ public IEnumerable<IEntry> Entries
         /// Gets folder name.
         /// </summary>
         /// <value>Folder name.</value>
-        public string Name
-        {
-            get
-            {
-                string z = WebDavPath.Name(FullPath); //FullPath == "/" ? "" : FullPath.TrimEnd('/').Remove(0, FullPath.LastIndexOf('/') + 1);
-                return z;
-            }
-        }
+        public string Name => WebDavPath.Name(FullPath);
 
         /// <summary>
         /// Gets folder size.
@@ -114,7 +105,6 @@ public string FullPath
         public FileAttributes Attributes { get; set; } = FileAttributes.Directory;
 
         public bool IsFile => false;
-        public bool CryptRequired => Files.Any(f => f.Name == CryptFileInfo.FileName);
 
         public PublishInfo ToPublishInfo()
         {

diff --git a/MailRuCloud/MailRuCloudApi/Base/Repos/MobileRequestRepo.cs b/MailRuCloud/MailRuCloudApi/Base/Repos/MobileRequestRepo.cs
@@ -9,6 +9,7 @@
 using YaR.MailRuCloud.Api.Base.Requests.WebBin;
 using YaR.MailRuCloud.Api.Base.Requests.WebBin.Types;
 using YaR.MailRuCloud.Api.Base.Streams;
+using YaR.MailRuCloud.Api.Common;
 using YaR.MailRuCloud.Api.Extensions;
 using YaR.MailRuCloud.Api.Links;
 
@@ -201,7 +202,7 @@ public async Task<RenameResult> Rename(string fullPath, string newName)
         {
             string target = WebDavPath.Combine(WebDavPath.Parent(fullPath), newName);
 
-            await new RenameRequest(HttpSettings, Authent, _metaServer.Value.Url, fullPath, target)
+            await new MoveRequest(HttpSettings, Authent, _metaServer.Value.Url, fullPath, target)
                 .MakeRequestAsync();
             var res = new RenameResult { IsSuccess = true };
             return res;

diff --git a/MailRuCloud/MailRuCloudApi/Base/Repos/ShardManager.cs b/MailRuCloud/MailRuCloudApi/Base/Repos/ShardManager.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+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
+{
+    class ShardManager
+    {
+        //TODO: refact required
+
+        private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(typeof(ShardManager));
+
+        public ShardManager(HttpCommonSettings httpsettings, IAuth auth)
+        {
+            _metaServer = new Cached<Requests.WebBin.MobMetaServerRequest.Result>(old =>
+                {
+                    Logger.Debug("Requesting new meta server");
+                    var server = new Requests.WebBin.MobMetaServerRequest(httpsettings).MakeRequestAsync().Result;
+                    return server;
+                },
+                value => TimeSpan.FromSeconds(MetaServerExpiresSec));
+
+            BannedShards = new Cached<List<ShardInfo>>(old => new List<ShardInfo>(),
+                value => TimeSpan.FromMinutes(2));
+
+            CachedShards = new Cached<Dictionary<ShardType, ShardInfo>>(old => new ShardInfoRequest(httpsettings, auth).MakeRequestAsync().Result.ToShardInfo(),
+                value => TimeSpan.FromSeconds(ShardsExpiresInSec));
+
+            DownloadServersPending = new Pending<Cached<Requests.WebBin.MobDownloadServerRequest.Result>>(8,
+                () => new Cached<Requests.WebBin.MobDownloadServerRequest.Result>(old =>
+                    {
+                        Logger.Debug("Requesting new download server");
+                        var server = new Requests.WebBin.MobDownloadServerRequest(httpsettings).MakeRequestAsync().Result;
+                        return server;
+                    },
+                    value => TimeSpan.FromSeconds(DownloadServerExpiresSec)
+                ));
+        }
+
+
+        public Pending<Cached<Requests.WebBin.MobDownloadServerRequest.Result>> DownloadServersPending { get; }
+
+        public ShardInfo MetaServer => new ShardInfo {Url = _metaServer.Value.Url, Count = _metaServer.Value.Unknown};
+        private readonly Cached<Requests.WebBin.MobMetaServerRequest.Result> _metaServer;
+
+        public Cached<Dictionary<ShardType, ShardInfo>> CachedShards { get; }
+
+        public Cached<List<ShardInfo>> BannedShards { get; }
+
+
+        private const int ShardsExpiresInSec = 30 * 60;
+        private const int MetaServerExpiresSec = 20 * 60;
+        private const int DownloadServerExpiresSec = 3 * 60;
+    }
+}