Merge branch 'develop2'

.gitignore

@@ -160,3 +160,4 @@ $RECYCLE.BIN/
 # Mac desktop service store files
 .DS_Store
 /_gsdata_/
+/.cr/

MailRuCloud/MailRuCloudApi/Base/Repos/WebM1RequestRepo.cs

@@ -252,7 +252,7 @@ public async Task<IEntry> FolderInfo(string path, Link ulink, int offset = 0, in
                     home: WebDavPath.Parent(path),
                     ulink: ulink,
                     filename: ulink == null ? WebDavPath.Name(path) : ulink.OriginalName,
-                    nameReplacement: WebDavPath.Name(path))
+                    nameReplacement: ulink?.IsLinkedToFileSystem ?? true ? WebDavPath.Name(path) : null )
                 : datares.ToFolder(path, ulink);
 
             return entry;

MailRuCloud/MailRuCloudApi/CloudSettings.cs

@@ -13,9 +13,12 @@ public class CloudSettings
 
 	    public int ListDepth
 	    {
-		    get { return CacheListingSec > 0 ? _listDepth : 1; }
-		    set { _listDepth = value; }
+		    get => CacheListingSec > 0 ? _listDepth : 1;
+	        set => _listDepth = value;
 	    }
 		private int _listDepth = 1;
-	}
+
+        public string SpecialCommandPrefix { get; set; } = ">>";
+        public string AdditionalSpecialCommandPrefix { get; set; } = ">>";
+    }
 }

MailRuCloud/MailRuCloudApi/Extensions/DtoImportWeb.cs

@@ -260,10 +260,11 @@ public static Folder ToFolder(this FolderInfoResult data, string home = null, Li
 
         public static File ToFile(this FolderInfoResult data, string home = null, Link ulink = null, string filename = null, string nameReplacement = null)
         {
-            if (string.IsNullOrEmpty(filename))
-            {
-                return new File(WebDavPath.Combine(data.body.home ?? "", data.body.name), data.body.size);
-            }
+            if (ulink == null || ulink.IsLinkedToFileSystem)
+                if (string.IsNullOrEmpty(filename))
+                {
+                    return new File(WebDavPath.Combine(data.body.home ?? "", data.body.name), data.body.size);
+                }
 
             PatchEntryPath(data, home, ulink);
 
@@ -273,9 +274,14 @@ public static File ToFile(this FolderInfoResult data, string home = null, Link u
                                 ? it.ToFile(nameReplacement)
                                 : it.ToFile())
                 .ToList();
+
+            var cmpname = string.IsNullOrEmpty(nameReplacement)
+                ? filename
+                : nameReplacement;
+
             var groupedFile = z?
                 .ToGroupedFiles()
-                .First(it => it.Name == (string.IsNullOrEmpty(nameReplacement) ? filename : nameReplacement));
+                .First(it => string.IsNullOrEmpty(cmpname) || it.Name == cmpname);
 
             return groupedFile;
         }

MailRuCloud/MailRuCloudApi/Links/Link.cs

@@ -8,15 +8,16 @@ namespace YaR.MailRuCloud.Api.Links
 {
     public class Link : IEntry
     {
-        private Link()
+        public Link(string href)
         {
+            Href = href;
+            IsLinkedToFileSystem = false;
         }
 
-        public Link(ItemLink rootLink, string fullPath, string href) : this()
+        public Link(ItemLink rootLink, string fullPath, string href) : this(href)
         {
             _rootLink = rootLink;
             FullPath = fullPath;
-            Href = href;
 
             IsRoot = WebDavPath.PathEquals(WebDavPath.Parent(FullPath), _rootLink.MapTo);
 
@@ -31,6 +32,8 @@ public Link(ItemLink rootLink, string fullPath, string href) : this()
             CreationTimeUtc = rootLink.CreationDate ?? DateTime.Now;
         }
 
+        public bool IsLinkedToFileSystem { get; } = true;
+
         private readonly ItemLink _rootLink;
 
         public string OriginalName { get; set; }

MailRuCloud/MailRuCloudApi/MailRuCloud.cs

@@ -5,6 +5,7 @@
 using System.Net;
 using System.Security.Authentication;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -34,7 +35,9 @@ public class MailRuCloud : IDisposable
         /// Async tasks cancelation token.
         /// </summary>
         public readonly CancellationTokenSource CancelToken = new CancellationTokenSource();
-		private readonly CloudSettings _settings;
+
+        public CloudSettings Settings => _settings;
+        private readonly CloudSettings _settings;
 
 		/// <summary>
 		/// Gets or sets account to connect with cloud.
@@ -72,6 +75,13 @@ public enum ItemType
             Unknown
         }
 
+        public virtual async Task<IEntry> GetPublicItemAsync(string path, ItemType itemType = ItemType.Unknown)
+        {
+            var entry = await Account.RequestRepo.FolderInfo(path, new Link(path));
+
+            return entry;
+        }
+
         ///// <summary>
         ///// Get list of files and folders from account.
         ///// </summary>
@@ -81,6 +91,13 @@ public enum ItemType
         ///// <returns>List of the items.</returns>
         public virtual async Task<IEntry> GetItemAsync(string path, ItemType itemType = ItemType.Unknown, bool resolveLinks = true)
         {
+            //TODO: вообще, всё плохо стало, всё запуталось, всё надо переписать
+            var uriMatch = Regex.Match(path, @"\A/https://cloud\.mail\.\w+/public(?<uri>/\S+/\S+)\Z");
+            if (uriMatch.Success)
+            {
+                return await GetPublicItemAsync(uriMatch.Groups["uri"].Value, itemType);
+            }
+
             path = WebDavPath.Clean(path);
 
 	        if (_settings.CacheListingSec > 0)

MailRuCloud/MailRuCloudApi/MailRuCloudApi.csproj

@@ -5,8 +5,8 @@
     <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
     <RootNamespace>YaR.MailRuCloud.Api</RootNamespace>
     <AssemblyName>MailRuCloud.Api</AssemblyName>
-    <AssemblyVersion>1.10.1.15</AssemblyVersion>
-    <FileVersion>1.10.1.15</FileVersion>
+    <AssemblyVersion>1.10.1.16</AssemblyVersion>
+    <FileVersion>1.10.1.16</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

MailRuCloud/MailRuCloudApi/SpecialCommands/SpecialCommandFabric.cs

@@ -73,22 +73,51 @@ public class SpecialCommandFabric
 
         public SpecialCommand Build(MailRuCloud cloud, string param)
         {
-            if (null == param || !param.Contains("/>>")) return null;
+            var res = ParceLine(param, cloud.Settings.SpecialCommandPrefix);
+            if (!res.IsValid && !string.IsNullOrEmpty(cloud.Settings.AdditionalSpecialCommandPrefix))
+                res = ParceLine(param, cloud.Settings.AdditionalSpecialCommandPrefix);
+            if (!res.IsValid)
+                return null;
 
-            int pos = param.LastIndexOf("/>>", StringComparison.Ordinal);
-            string path = WebDavPath.Clean(param.Substring(0, pos + 1));
-            string data = param.Substring(pos + 3);
-
-            var parames = ParseParameters(data);
+            var parames = ParseParameters(res.Data);
             var commandContainer = FindCommandContainer(parames);
             if (commandContainer == null) return null;
 
             parames = parames.Skip(commandContainer.Commands.Length).ToList();
-            var cmd = commandContainer.CreateFunc(cloud, path, parames);
+            var cmd = commandContainer.CreateFunc(cloud, res.Path, parames);
 
             return cmd;
         }
 
+        private ParamsData ParceLine(string param, string prefix)
+        {
+            if (string.IsNullOrEmpty(prefix)) return ParamsData.Invalid;
+
+            string pre = "/" + prefix;
+            if (null == param || !param.Contains(pre)) return ParamsData.Invalid;
+
+            int pos = param.LastIndexOf(pre, StringComparison.Ordinal);
+            string path = WebDavPath.Clean(param.Substring(0, pos + 1));
+            string data = param.Substring(pos + pre.Length);
+
+            return new ParamsData
+            {
+                IsValid = true,
+                Path = path,
+                Data = data
+            };
+        }
+
+        private struct  ParamsData
+        {
+            public bool IsValid { get; set; }
+            public string Path { get; set; }
+            public string Data { get; set; }
+
+            public static ParamsData Invalid => new ParamsData {IsValid = false};
+
+        }
+
         private SpecialCommandContainer FindCommandContainer(IList<string> parames)
         {
             var commandContainer = CommandContainers

WDMRC.Console/Config.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Xml;
 
 namespace YaR.CloudMailRu.Console
@@ -24,5 +25,24 @@ public static string TwoFactorAuthHandlerName
                 return res;
             }
         }
+
+        public static string SpecialCommandPrefix => ">>";
+
+        public static string AdditionalSpecialCommandPrefix
+        {
+            get
+            {
+                try
+                {
+                    var res = Document.SelectSingleNode("/config/AdditionalSpecialCommandPrefix").InnerText;
+                    return res;
+                }
+                catch (Exception)
+                {
+                    return null;
+                }
+
+            }
+        }
     }
 }

WDMRC.Console/Payload.cs

@@ -47,7 +47,8 @@ public static void Run(CommandLineOptions options)
                 Protocol = options.Protocol,
                 UserAgent = options.UserAgent,
                 CacheListingSec = options.CacheListingSec,
-	            ListDepth = options.CacheListingDepth
+	            ListDepth = options.CacheListingDepth,
+                AdditionalSpecialCommandPrefix = Config.AdditionalSpecialCommandPrefix
             };
 
             var httpListener = new HttpListener();

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.10.1.15</AssemblyVersion>
-    <FileVersion>1.10.1.14</FileVersion>
+    <AssemblyVersion>1.10.1.16</AssemblyVersion>
+    <FileVersion>1.10.1.16</FileVersion>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.CloudMailRu.Console</RootNamespace>
     <StartupObject></StartupObject>

WDMRC.Console/wdmrc.config

@@ -48,6 +48,7 @@
   </log4net>
 
   <TwoFactorAuthHandlerName serializeAs="String">AuthCodeConsole</TwoFactorAuthHandlerName>
-
+
+  <AdditionalSpecialCommandPrefix serializeAs="String">.,.</AdditionalSpecialCommandPrefix>
 
 </config>