Skip to content

Commit

Permalink
Support of final backslash in path arguments.
Browse files Browse the repository at this point in the history
  • Loading branch information
akesseler committed Jul 26, 2019
1 parent 3751fac commit 0451328
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 109 deletions.
5 changes: 5 additions & 0 deletions code/src/HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

**1.0.2**
- Bugfix, support of final backslash in path arguments.
- Version number increased.
- Releasing and publishing all changes on GitHub.

**1.0.1**
- Extending of version information by a _Platform_ value.
- Adding of command-line argument named `settings`.
Expand Down
4 changes: 2 additions & 2 deletions code/src/QuickCopy/Models/Arguments.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ public Arguments()

#region Public properties

[HelpSummary("The source folder path. This parameter optionally depends on parameter \"pattern\". Don't use a final backslash if path is enclosed in double-quotes!")]
[HelpSummary("The source folder path. This parameter optionally depends on parameter \"pattern\".")]
[OptionParameter(SolidLabel = "source", BriefLabel = "s", DependencyList = "Pattern", DependencyType = DependencyType.Optional)]
public String Source { get; set; }

[HelpSummary("The target folder path. Don't use a final backslash if path is enclosed in double-quotes!")]
[HelpSummary("The target folder path.")]
[OptionParameter(SolidLabel = "target", BriefLabel = "t")]
public String Target { get; set; }

Expand Down
15 changes: 10 additions & 5 deletions code/src/QuickCopy/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Program
internal static Int32 Main(String[] options)
{
Program instance = new Program();
return instance.Run(options);
return instance.Run();
}

#endregion
Expand Down Expand Up @@ -95,9 +95,9 @@ private Program()

#region Private methods

private Int32 Run(String[] options)
private Int32 Run()
{
if (!this.TryParse(options))
if (!this.TryParse())
{
this.ShowHelp();
return -1;
Expand Down Expand Up @@ -211,12 +211,17 @@ private void Process()
}
}

private Boolean TryParse(String[] options)
private Boolean TryParse()
{
try
{
if (options != null && options.Length > 0)
List<String> options = new List<String>(Environment.CommandLine.Extract());

if (options != null && options.Count > 1)
{
// Remove name of executable...
options.RemoveAt(0);

this.arguments.Process(options);
this.arguments.Validate();
return true;
Expand Down
4 changes: 2 additions & 2 deletions code/src/QuickCopy/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.0.1")]
[assembly: AssemblyVersion("1.0.2")]
[assembly: AssemblyFileVersion("1.0.2")]
4 changes: 2 additions & 2 deletions code/src/QuickCopy/QuickCopy.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
<ApplicationIcon>app.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Plexdata.ArgumentParser.NET, Version=1.0.0.12, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plexdata.ArgumentParser.NET.1.0.0.12\lib\net472\Plexdata.ArgumentParser.NET.dll</HintPath>
<Reference Include="Plexdata.ArgumentParser.NET, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plexdata.ArgumentParser.NET.1.0.1\lib\net472\Plexdata.ArgumentParser.NET.dll</HintPath>
</Reference>
<Reference Include="Plexdata.LogWriter.Abstraction, Version=1.0.3.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Plexdata.LogWriter.Abstraction.1.0.3.2\lib\netstandard2.0\Plexdata.LogWriter.Abstraction.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion code/src/QuickCopy/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Plexdata.ArgumentParser.NET" version="1.0.0.12" targetFramework="net48" />
<package id="Plexdata.ArgumentParser.NET" version="1.0.1" targetFramework="net48" />
<package id="Plexdata.LogWriter.Abstraction" version="1.0.3.2" targetFramework="net48" />
<package id="Plexdata.LogWriter.Console" version="1.0.3.2" targetFramework="net48" />
<package id="Plexdata.LogWriter.Console.Standard" version="1.0.3.2" targetFramework="net48" />
Expand Down
60 changes: 15 additions & 45 deletions code/src/QuickCopySetup/QuickCopySetup-x64.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"Entry"
{
"MsmKey" = "8:_2D25E108D76604A6993A0C38918EB402"
"OwnerKey" = "8:_A348B2037FFC3F4C9CD7E1898BD3D951"
"OwnerKey" = "8:_F46428EF2D838DD84DE74465C24DA71F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand All @@ -46,7 +46,7 @@
"Entry"
{
"MsmKey" = "8:_2D25E108D76604A6993A0C38918EB402"
"OwnerKey" = "8:_F46428EF2D838DD84DE74465C24DA71F"
"OwnerKey" = "8:_A348B2037FFC3F4C9CD7E1898BD3D951"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -106,25 +106,25 @@
"Entry"
{
"MsmKey" = "8:_DA691AB16799DF87A8BDF9FA3815DCAA"
"OwnerKey" = "8:_A348B2037FFC3F4C9CD7E1898BD3D951"
"OwnerKey" = "8:_2D25E108D76604A6993A0C38918EB402"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DA691AB16799DF87A8BDF9FA3815DCAA"
"OwnerKey" = "8:_8F53DF20353747964155B04488BB801D"
"OwnerKey" = "8:_F46428EF2D838DD84DE74465C24DA71F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DA691AB16799DF87A8BDF9FA3815DCAA"
"OwnerKey" = "8:_F46428EF2D838DD84DE74465C24DA71F"
"OwnerKey" = "8:_8F53DF20353747964155B04488BB801D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DA691AB16799DF87A8BDF9FA3815DCAA"
"OwnerKey" = "8:_2D25E108D76604A6993A0C38918EB402"
"OwnerKey" = "8:_A348B2037FFC3F4C9CD7E1898BD3D951"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand All @@ -148,37 +148,37 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_AFBEAA056A26ABD41263D8811AF977D9"
"OwnerKey" = "8:_B14407F43D9E6ECC79DDAE74184C33E8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DA691AB16799DF87A8BDF9FA3815DCAA"
"OwnerKey" = "8:_7BE531674E7212648F8036F8F09D1385"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1AAC765ABF9D5759CC4687669F4DD3BA"
"OwnerKey" = "8:_7F2F335BB9AE3C45181EDE6459D36BBC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7F2F335BB9AE3C45181EDE6459D36BBC"
"OwnerKey" = "8:_1AAC765ABF9D5759CC4687669F4DD3BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7BE531674E7212648F8036F8F09D1385"
"OwnerKey" = "8:_DA691AB16799DF87A8BDF9FA3815DCAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_B14407F43D9E6ECC79DDAE74184C33E8"
"OwnerKey" = "8:_AFBEAA056A26ABD41263D8811AF977D9"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -334,11 +334,6 @@
"AssemblyAsmDisplayName" = "8:Plexdata.LogWriter.Abstraction, Version=1.0.3.2, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_2D25E108D76604A6993A0C38918EB402"
{
"Name" = "8:Plexdata.LogWriter.Abstraction.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Plexdata.LogWriter.Abstraction.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -427,11 +422,6 @@
"AssemblyAsmDisplayName" = "8:Plexdata.LogWriter.Console.Standard, Version=1.0.3.2, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8F53DF20353747964155B04488BB801D"
{
"Name" = "8:Plexdata.LogWriter.Console.Standard.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Plexdata.LogWriter.Console.Standard.dll"
"TargetName" = "8:"
Expand All @@ -458,11 +448,6 @@
"AssemblyAsmDisplayName" = "8:Plexdata.LogWriter.Persistent, Version=1.0.3.2, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_A348B2037FFC3F4C9CD7E1898BD3D951"
{
"Name" = "8:Plexdata.LogWriter.Persistent.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Plexdata.LogWriter.Persistent.dll"
"TargetName" = "8:"
Expand All @@ -489,11 +474,6 @@
"AssemblyAsmDisplayName" = "8:Plexdata.ArgumentParser.NET, Version=1.0.0.12, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_AFBEAA056A26ABD41263D8811AF977D9"
{
"Name" = "8:Plexdata.ArgumentParser.NET.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Plexdata.ArgumentParser.NET.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -551,11 +531,6 @@
"AssemblyAsmDisplayName" = "8:netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
"ScatterAssemblies"
{
"_DA691AB16799DF87A8BDF9FA3815DCAA"
{
"Name" = "8:netstandard.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:netstandard.dll"
"TargetName" = "8:"
Expand All @@ -582,11 +557,6 @@
"AssemblyAsmDisplayName" = "8:Plexdata.LogWriter.Console, Version=1.0.3.2, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_F46428EF2D838DD84DE74465C24DA71F"
{
"Name" = "8:Plexdata.LogWriter.Console.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Plexdata.LogWriter.Console.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -640,15 +610,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:QuickCopy"
"ProductCode" = "8:{685BAB40-E7AE-4CD9-8045-4560FB043C50}"
"PackageCode" = "8:{45ECB874-5749-4595-81B6-5DB1D8A85179}"
"ProductCode" = "8:{1442F5BF-6EE0-4EE6-A3A8-239829A344B4}"
"PackageCode" = "8:{DE9AF3D1-891F-48BB-9BD6-82AFE7D60467}"
"UpgradeCode" = "8:{423C0C0A-FE93-4C8C-AACD-21D849D73470}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.0.1"
"ProductVersion" = "8:1.0.2"
"Manufacturer" = "8:Plexdata"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
Loading

0 comments on commit 0451328

Please sign in to comment.