Merge branch 'develop2'

MailRuCloud/MailRuCloudApi/SpecialCommands/CleanTrashCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/CleanTrashCommand.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     /// <summary>
     /// Î÷èñòêà êîðçèíû

MailRuCloud/MailRuCloudApi/SpecialCommands/CopyCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/CopyCommand.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class CopyCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/CryptInitCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/CryptInitCommand.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     /// <summary>
     /// Ñîçäàåò äëÿ êàòàëîãà ïðèçíàê, ÷òî ôàéëû â í¸ì áóäóò øèôðîâàòüñÿ

MailRuCloud/MailRuCloudApi/SpecialCommands/CryptPasswdCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/CryptPasswdCommand.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     /// <summary>
     /// Ïàðîëü äëÿ (äå)øèôðîâàíèÿ

MailRuCloud/MailRuCloudApi/SpecialCommands/DeleteCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/DeleteCommand.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class DeleteCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/FishCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/FishCommand.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     /// <summary>
     /// Join random file from cloud. If you got it - you are biggest f@kn lucker of Universe!

MailRuCloud/MailRuCloudApi/SpecialCommands/JoinCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/JoinCommand.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class JoinCommand: SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/ListCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/ListCommand.cs

@@ -6,7 +6,7 @@
 using YaR.Clouds.Base;
 using YaR.Clouds.Base.Repos;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class ListCommand : SpecialCommand
     {
@@ -20,12 +20,14 @@ public ListCommand(Cloud cloud, string path, IList<string> parames) : base(cloud
 
         public override async Task<SpecialCommandResult> Execute()
         {
-            string name = Parames.Count > 0 && !string.IsNullOrWhiteSpace(Parames[0])
-                ? Parames[0]
-                : ".wdmrc.list.lst";
-            string target = WebDavPath.Combine(Path, name);
+
 
-            var data = await Cloud.Account.RequestRepo.FolderInfo(RemotePath.Get(Path));
+            string target = Parames.Count > 0 && !string.IsNullOrWhiteSpace(Parames[0])
+                ? (Parames[0].StartsWith(WebDavPath.Separator) ? Parames[0] : WebDavPath.Combine(Path, Parames[0]))
+                : Path;
+
+            var data = await Cloud.Account.RequestRepo.FolderInfo(RemotePath.Get(target));
+            string resFilepath = WebDavPath.Combine(Path, data.Name + ".wdmrc.list.lst");
 
             var sb = new StringBuilder();
             foreach (var e in Flat(data))
@@ -36,7 +38,7 @@ public override async Task<SpecialCommandResult> Execute()
                     $"{e.FullPath}\t{e.Size.DefaultValue}\t{e.CreationTimeUtc:yyyy.MM.dd HH:mm:ss}\t{hash}\t{link}");
             }
 
-            Cloud.UploadFile(target, sb.ToString());
+            Cloud.UploadFile(resFilepath, sb.ToString());
 
             return SpecialCommandResult.Success;
         }

MailRuCloud/MailRuCloudApi/SpecialCommands/LocalToServerCopyCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/LocalToServerCopyCommand.cs

@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class LocalToServerCopyCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/MoveCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/MoveCommand.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class MoveCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/RemoveBadLinksCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/RemoveBadLinksCommand.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class RemoveBadLinksCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/ShareCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/ShareCommand.cs

@@ -5,7 +5,7 @@
 using YaR.Clouds.Common;
 using YaR.Clouds.Extensions;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class ShareCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/SharedFolderLinkCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/SharedFolderLinkCommand.cs

@@ -6,7 +6,7 @@
 using YaR.Clouds.Base.Repos.MailRuCloud;
 using YaR.Clouds.Links;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class SharedFolderLinkCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/TestCommand.cs → MailRuCloud/MailRuCloudApi/SpecialCommands/Commands/TestCommand.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using YaR.Clouds.Base;
 
-namespace YaR.Clouds.SpecialCommands
+namespace YaR.Clouds.SpecialCommands.Commands
 {
     public class TestCommand : SpecialCommand
     {

MailRuCloud/MailRuCloudApi/SpecialCommands/SpecialCommandFabric.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using YaR.Clouds.Base;
+using YaR.Clouds.SpecialCommands.Commands;
 
 namespace YaR.Clouds.SpecialCommands
 {

MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj

@@ -5,8 +5,8 @@
     <TargetFrameworks>netcoreapp3.0;net48</TargetFrameworks>
     <RootNamespace>YaR.Clouds</RootNamespace>
     <AssemblyName>YaR.Clouds</AssemblyName>
-    <AssemblyVersion>1.12.0.0</AssemblyVersion>
-    <FileVersion>1.12.0.0</FileVersion>
+    <AssemblyVersion>1.12.1.0</AssemblyVersion>
+    <FileVersion>1.12.1.0</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

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.12.0.0</AssemblyVersion>
-    <FileVersion>1.12.0.0</FileVersion>
+    <AssemblyVersion>1.12.1.0</AssemblyVersion>
+    <FileVersion>1.12.1.0</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.Clouds.Console</RootNamespace>

readme.md

@@ -98,6 +98,7 @@ Parameters with spaces must be screened by quotes.
 * `>>move` `/full/path/from /full/path/to` Fast move (if your client moves inner items recursively)
 * `>>copy` `/full/path/from /full/path/to` Fast copy (if your client copies inner items recursively)
 * `>>lcopy` `x:/local/path/from /full/server/path/to` If file already in cloud, add it by hash without uploading
+* `>>rlist` [[/]path] [list_filename]	list [path] to [list_filename]
 * `>>del [[/]path]` Fast delete (if your client makes recursive deletions of inner items)
 * `>>share [[/]path]` Make file/folder public <br/>
   - and create `.share.wdmrc` file with links