Merge branch 'develop2' into master

yar229 · Oct 27, 2020 · 0f25f0e · 0f25f0e
2 parents 45adb35 + 61d5ef9
commit 0f25f0e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 12 deletions.
diff --git a/MailRuCloud/MailRuCloudApi/Base/Streams/Cache/CacheStream.cs b/MailRuCloud/MailRuCloudApi/Base/Streams/Cache/CacheStream.cs
@@ -37,16 +37,16 @@ private DataCache GetCache()
         {
             foreach (var rule in _deduplicateRules.Rules)
             {
-                if ( 
-                    (string.IsNullOrEmpty(rule.Target) || Regex.Match(_file.FullPath, rule.Target).Success) && 
+                if (
                     (rule.MaxSize == 0 || rule.MaxSize > _file.Size) && 
-                    _file.Size >= rule.MinSize  )
+                    _file.Size >= rule.MinSize &&
+                    (string.IsNullOrEmpty(rule.Target) || Regex.Match(_file.FullPath, rule.Target).Success) )
                 {
                     switch (rule.CacheType)
                     {
                         case CacheType.Memory : return new MemoryDataCache();
                         case CacheType.Disk : return new DiskDataCache(_deduplicateRules.DiskPath);
-                        default: throw new NotImplementedException($"DataCache not implmented for {rule.CacheType}");
+                        default: throw new NotImplementedException($"DataCache not implemented for {rule.CacheType}");
                     }
                 }
             }

diff --git a/MailRuCloud/MailRuCloudApi/Base/Streams/UploadStreamHttpClient.cs b/MailRuCloud/MailRuCloudApi/Base/Streams/UploadStreamHttpClient.cs
@@ -43,7 +43,7 @@ private void Upload()
             {
                 if (Repo.SupportsAddSmallFileByHash && _file.OriginalSize <= _cloudFileHasher.Length) // do not send upload request if file content fits to hash
                     UploadSmall(_ringBuffer);
-                else if (Repo.SupportsDeduplicate && _cloud.Settings.UseDeduplicate && !_file.ServiceInfo.IsCrypted) // && !_file.ServiceInfo.SplitInfo.IsPart)
+                else if (Repo.SupportsDeduplicate && _cloud.Settings.UseDeduplicate) // && !_file.ServiceInfo.IsCrypted) // && !_file.ServiceInfo.SplitInfo.IsPart)
                     UploadCache(_ringBuffer);
                 else
                     UploadFull(_ringBuffer);
@@ -76,7 +76,7 @@ private void UploadCache(Stream sourceStream)
             if (cache.Process())
             {
                 Logger.Debug($"Uploading [{cache.DataCacheName}] {_file.FullPath}");
-
+                
                 OnFileStreamSent();
 
                 _file.Hash = _cloudFileHasher.Hash;

diff --git a/MailRuCloud/MailRuCloudApi/Streams/UploadStreamFabric.cs b/MailRuCloud/MailRuCloudApi/Streams/UploadStreamFabric.cs
@@ -72,10 +72,14 @@ private Stream GetCryptoStream(File file, FileUploadedDelegate onUploaded)
                 ? file.OriginalSize.DefaultValue
                 : (file.OriginalSize / XTSWriteOnlyStream.BlockSize + 1) * XTSWriteOnlyStream.BlockSize;
 
-            var ustream = new SplittedUploadStream(file.FullPath, _cloud, size, FileStreamSent, ServerFileProcessed, false, file.ServiceInfo.CryptInfo);
+            var ustream = new SplittedUploadStream(file.FullPath, _cloud, size, null, null, false, file.ServiceInfo.CryptInfo);
             if (onUploaded != null) ustream.FileUploaded += onUploaded;
             // ReSharper disable once RedundantArgumentDefaultValue
-            var encustream = new XTSWriteOnlyStream(ustream, xts, XTSWriteOnlyStream.DefaultSectorSize);
+            var encustream = new XTSWriteOnlyStream(ustream, xts, XTSWriteOnlyStream.DefaultSectorSize)
+            {
+                FileStreamSent = FileStreamSent,
+                ServerFileProcessed = ServerFileProcessed
+            };
 
             return encustream;
         }

diff --git a/MailRuCloud/MailRuCloudApi/XTSSharp/XTSWriteOnlyStream.cs b/MailRuCloud/MailRuCloudApi/XTSSharp/XTSWriteOnlyStream.cs
@@ -33,6 +33,12 @@ public XTSWriteOnlyStream(Stream baseStream, Xts xts, int sectorSize = DefaultSe
             _sectorBuffer = new byte[sectorSize];
         }
 
+        public Action FileStreamSent;
+        private void OnFileStreamSent() => FileStreamSent?.Invoke();
+
+        public Action ServerFileProcessed;
+        private void OnServerFileProcessed() => ServerFileProcessed?.Invoke();
+
 
         private int _sectorBufferCount;
 
@@ -74,10 +80,15 @@ protected override void Dispose(bool disposing)
 
                 int transformedCount = _encryptor.TransformBlock(_sectorBuffer, 0, towrite, _encriptedBuffer, 0, _currentSector);
                 _baseStream.Write(_encriptedBuffer, 0, towrite);
+
             }
 
+            OnFileStreamSent();
+
             _baseStream.Dispose();
             _encryptor.Dispose();
+
+            OnServerFileProcessed();
         }
 
 

diff --git a/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj b/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj
@@ -5,8 +5,8 @@
     <TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
     <RootNamespace>YaR.Clouds</RootNamespace>
     <AssemblyName>YaR.Clouds</AssemblyName>
-    <AssemblyVersion>1.13.0.1</AssemblyVersion>
-    <FileVersion>1.13.0.1</FileVersion>
+    <AssemblyVersion>1.13.0.2</AssemblyVersion>
+    <FileVersion>1.13.0.2</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -11,8 +11,8 @@
     <Copyright>[email protected]</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.13.0.1</AssemblyVersion>
-    <FileVersion>1.13.0.1</FileVersion>
+    <AssemblyVersion>1.13.0.2</AssemblyVersion>
+    <FileVersion>1.13.0.2</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.Clouds.Console</RootNamespace>

diff --git a/WDMRC.Console/wdmrc.config b/WDMRC.Console/wdmrc.config
@@ -150,6 +150,8 @@
 
       <!-- files larger than 15000000 bytes will be cached on disk -->
       <Rule Cache="Disk" Target = "" MinSize = "15000000" MaxSize = "0" />
+
+      <!-- files not matched by any rule above will be uploaded directly -->
     </Rules>
   </Deduplicate>