v1.1.1

- Fix for file/path parameter during CLAR_UPLOAD

Author: swhitley

CLARiNET.csproj

@@ -7,7 +7,7 @@
     <PackageIcon>CLARiNET.ico</PackageIcon>
     <PackageIconUrl />
     <ApplicationIcon>CLARiNET.ico</ApplicationIcon>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

Program.cs

@@ -265,23 +265,31 @@ static bool InitOptions(string[] args)
                 options.Command = options.Command.Trim().ToUpper();
             }
 
+            // Path parameter is a file
+            if (options != null && options.Path != null && options.Command == Command.CLAR_UPLOAD)
+            {
+                if (File.Exists(options.Path))
+                {
+                    searchPattern = Path.GetFileName(options.Path);
+                    options.Path = options.Path.Substring(0, options.Path.Length - searchPattern.Length);
+                }
+            }
+
             // Set search pattern and cloud collection if parameters are included.
             if (options != null && options.Parameters != null)
             {
                 switch (options.Command)
                 {
-                    case Command.CLAR_UPLOAD:
+                    case Command.CLAR_UPLOAD:                       
+                        cloudCollection = options.Parameters;
+                        break;
                     case Command.CLAR_DOWNLOAD:                        
-                        if (options.Command == Command.CLAR_DOWNLOAD)
-                        {
-                            searchPattern = "";
-                            options.Parameters = Path.GetFileName(Path.TrimEndingDirectorySeparator(options.Parameters));
-                        }
+                        searchPattern = "";
+                        options.Parameters = Path.GetFileName(Path.TrimEndingDirectorySeparator(options.Parameters));
                         cloudCollection = options.Parameters;
                         break;
                     case Command.DRIVE_UPLOAD:
-                    case Command.DRIVE_TRASH:
-                    
+                    case Command.DRIVE_TRASH:                    
                         searchPattern = options.Parameters;
                         break;
                     case Command.PHOTO_DOWNLOAD:
@@ -402,7 +410,10 @@ static void ParameterOption()
                         cloudCollection = Console.ReadLine().Trim();
                         Console.WriteLine("");
                         options.Parameters = cloudCollection;
-                        searchPattern = "*.clar";
+                        if (searchPattern.ToLower().IndexOf(".clar") < 0)
+                        {
+                            searchPattern = "*.clar";
+                        }
                         if (options.Command == Command.CLAR_DOWNLOAD)
                         {
                             searchPattern = "";