Skip to content

Commit

Permalink
Merge pull request #255 from QutEcoacoustics/short-name-app-config-fix
Browse files Browse the repository at this point in the history
Short name app config fix
  • Loading branch information
atruskie authored Sep 11, 2019
2 parents 7542295 + d4fe77f commit 7fcf2bb
Show file tree
Hide file tree
Showing 17 changed files with 476 additions and 385 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ csharp_style_var_when_type_is_apparent = true:none
csharp_style_var_elsewhere = true:none
# Expression-bodied members
# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#expression_bodied_members
csharp_style_expression_bodied_methods = when_on_single_line:suggestion
csharp_style_expression_bodied_methods = when_on_single_line:hint
csharp_style_expression_bodied_constructors = when_on_single_line:suggestion
csharp_style_expression_bodied_operators = true:warning
csharp_style_expression_bodied_properties = true:warning
Expand Down
2 changes: 1 addition & 1 deletion docs/developing.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See [Contributing](https://github.com/QutEcoacoustics/audio-analysis/blob/master/CONTRIBUTING.md)
See [Contributing](https://github.com/QutEcoacoustics/audio-analysis/blob/master/CONTRIBUTING.md)
2 changes: 1 addition & 1 deletion src/Acoustics.Shared/Acoustics.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
<Compile Include="Csv\Csv.cs" />
<Compile Include="Csv\ISetPointConverter.cs" />
<Compile Include="Debugging\AutoAttachVs.cs" />
<Compile Include="Extensions\EnumExtensions.cs" />
<Compile Include="Enums.cs" />
<Compile Include="ExpressionVisitor.cs" />
<Compile Include="Extensions\ArrayExtensions.cs" />
Expand All @@ -230,7 +231,6 @@
<Compile Include="Extensions\RangeExtensions.cs" />
<Compile Include="Extensions\RectangleExtensions.cs" />
<Compile Include="Extensions\ReflectionExtensions.cs" />
<Compile Include="Extensions\StringCaseExtensions.cs" />
<Compile Include="Extensions\TaskExtensions.cs" />
<Compile Include="Extensions\TupleExtensions.cs" />
<Compile Include="Extensions\ZioExtensions.cs" />
Expand Down
7 changes: 1 addition & 6 deletions src/Acoustics.Shared/Enums.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="Enums.cs" company="QutEcoacoustics">
// <copyright file="Enums.cs" company="QutEcoacoustics">
// All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
// </copyright>

Expand All @@ -25,9 +25,4 @@ public enum ImageChrome
Without = 0,
With = 1,
}

public static class EnumExtenstions
{
public static ImageChrome ToImageChrome(this bool chromeOrNot) => chromeOrNot ? ImageChrome.With : ImageChrome.Without;
}
}
23 changes: 23 additions & 0 deletions src/Acoustics.Shared/Extensions/EnumExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// <copyright file="EnumExtensions.cs" company="QutEcoacoustics">
// All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
// </copyright>

namespace System
{
using Acoustics.Shared;

public static class EnumExtensions
{
public static ImageChrome ToImageChrome(this bool chromeOrNot) => chromeOrNot ? ImageChrome.With : ImageChrome.Without;

public static string PrintEnumOptions(this Type @enum)
{
if (@enum == null || !@enum.IsEnum)
{
throw new ArgumentException($"{nameof(PrintEnumOptions)} must only be used on an enum type", nameof(@enum));
}

return Enum.GetValues(@enum).Join("|");
}
}
}
23 changes: 20 additions & 3 deletions src/Acoustics.Shared/Extensions/EnumerableExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
// ReSharper disable once CheckNamespace
namespace System
{
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Acoustics.Shared;
using Acoustics.Shared.Contracts;
using Collections.Generic;
using JetBrains.Annotations;
using Linq;
using Threading.Tasks;

public static class EnumerableExtensions
{
Expand Down Expand Up @@ -311,5 +313,20 @@ public static IEnumerable<T> Append<T>(this IEnumerable<T> items, T newItem)

yield return newItem;
}

public static string Join(this IEnumerable items, string delimiter = " ") => Join(items.Cast<object>(), delimiter);

public static string Join<T>(this IEnumerable<T> items, string delimiter = " ")
{
var result = new StringBuilder();
foreach (var item in items)
{
result.Append(item);
result.Append(delimiter);
}

// return one delimiter length less because we always add a delimiter on the end
return result.ToString(0, result.Length - delimiter.Length);
}
}
}
Loading

0 comments on commit 7fcf2bb

Please sign in to comment.