9251646467

Committed 27 May 2024 08:23AM UTC coverage: 56.916% (+0.002%) from 56.914%

Build # 9251646467

Build Type

push

github

Committed by

web-flow

Commit Message

Marge v8.1.6 into main (#1842)

* bump to net8

* add sqlcli

* Bump Autoupdater.NET.Official from 1.8.4 to 1.8.5

Bumps [Autoupdater.NET.Official](https://github.com/ravibpatel/AutoUpdater.NET) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/ravibpatel/AutoUpdater.NET/releases)
- [Commits](https://github.com/ravibpatel/AutoUpdater.NET/compare/v1.8.4...v1.8.5)

---
updated-dependencies:
- dependency-name: Autoupdater.NET.Official
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Delete .nuget/packages.config (#1758)

* Delete .nuget/packages.config

Remove  hopefully obsolete package list confusing dependency tracking

* Remove .nuget folder

---------

Co-authored-by: James A Sutherland <>

* Bump svenstaro/upload-release-action from 2.7.0 to 2.9.0 (#1759)

* Bump shogo82148/actions-setup-perl from 1.28.0 to 1.29.0 (#1751)

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.28.0 to 1.29.0.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](https://github.com/shogo82148/actions-setup-perl/compare/v1.28.0...v1.29.0)

---
updated-dependencies:
- dependency-name: shogo82148/actions-setup-perl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Friel <jfriel001@dundee.ac.uk>

* Bump CsvHelper from 30.0.3 to 30.1.0 (#1737)

Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 30.0.3 to 30.1.0.
- [Commits](https://github.com/JoshClose/CsvHelper/compare/30.0.3...30.1.0)

---
updated-dependencies:
- dependency-name: CsvHelper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by... (continued)

Run Details

10836 of 20512 branches covered (52.83%)

Branch coverage included in aggregate %.

46 of 53 new or added lines in 8 files covered. (86.79%)

1 existing line in 1 file now uncovered.

30865 of 52756 relevant lines covered (58.51%)

7396.37 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

60.71

/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Icons.IconOverlays;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;

internal sealed class ExtractionInformationStateBasedIconProvider : IObjectStateBasedIconProvider
{
    private static readonly Image<Rgba32> ExtractionInformationCore =
        Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation);

    private static readonly Image<Rgba32> ExtractionInformationSupplemental =
        Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_Supplemental);

    private static readonly Image<Rgba32> ExtractionInformationSpecialApproval =
        Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_SpecialApproval);

    private static readonly Image<Rgba32> ExtractionInformationInternalOnly =
        IconOverlayProvider.GetOverlayNoCache(ExtractionInformationSpecialApproval, OverlayKind.Internal);

    private static readonly Image<Rgba32> ExtractionInformationDeprecated =
        IconOverlayProvider.GetOverlayNoCache(ExtractionInformationCore, OverlayKind.Deprecated);

    private static readonly Image<Rgba32> ExtractionInformationProjectSpecific =
        Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_ProjectSpecific);

    private static readonly Image<Rgba32> NoIconAvailable = Image.Load<Rgba32>(CatalogueIcons.NoIconAvailable);

    private static readonly Image<Rgba32> ExtractionInformationNotExtractable = IconOverlayProvider.GetOverlayNoCache(ExtractionInformationCore, OverlayKind.Delete);

    public Image<Rgba32> GetImageIfSupportedObject(object o)
    {
        if (o is ExtractionCategory cat)
            return GetImage(cat);

        if (o is not ExtractionInformation ei) return null;

        var toReturn = GetImage(ei.ExtractionCategory);

        if (ei.IsExtractionIdentifier)
            toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier);

        if (ei.IsPrimaryKey)
            toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key);

        if (ei.HashOnDataRelease)
            toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);

        return toReturn;
    }

    private static Image<Rgba32> GetImage(ExtractionCategory category)
    {
        return category switch
        {
            ExtractionCategory.Core => ExtractionInformationCore,
            ExtractionCategory.Supplemental => ExtractionInformationSupplemental,
            ExtractionCategory.SpecialApprovalRequired => ExtractionInformationSpecialApproval,
            ExtractionCategory.Internal => ExtractionInformationInternalOnly,
            ExtractionCategory.Deprecated => ExtractionInformationDeprecated,
            ExtractionCategory.ProjectSpecific => ExtractionInformationProjectSpecific,
            ExtractionCategory.Any => NoIconAvailable,
            ExtractionCategory.NotExtractable => ExtractionInformationNotExtractable,
            _ => throw new ArgumentOutOfRangeException(nameof(category))
        };
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using Rdmp.Core.Curation.Data;
9	using Rdmp.Core.Icons.IconOverlays;
10	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
11	using SixLabors.ImageSharp;
12	using SixLabors.ImageSharp.PixelFormats;
13
14	namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;
15
16	internal sealed class ExtractionInformationStateBasedIconProvider : IObjectStateBasedIconProvider
17	{
18	private static readonly Image<Rgba32> ExtractionInformationCore =	2✔
19	Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation);	2✔
20
21	private static readonly Image<Rgba32> ExtractionInformationSupplemental =	2✔
22	Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_Supplemental);	2✔
23
24	private static readonly Image<Rgba32> ExtractionInformationSpecialApproval =	2✔
25	Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_SpecialApproval);	2✔
26
27	private static readonly Image<Rgba32> ExtractionInformationInternalOnly =	2✔
28	IconOverlayProvider.GetOverlayNoCache(ExtractionInformationSpecialApproval, OverlayKind.Internal);	2✔
29
30	private static readonly Image<Rgba32> ExtractionInformationDeprecated =	2✔
31	IconOverlayProvider.GetOverlayNoCache(ExtractionInformationCore, OverlayKind.Deprecated);	2✔
32
33	private static readonly Image<Rgba32> ExtractionInformationProjectSpecific =	2✔
34	Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_ProjectSpecific);	2✔
35
36	private static readonly Image<Rgba32> NoIconAvailable = Image.Load<Rgba32>(CatalogueIcons.NoIconAvailable);	2✔
37
38	private static readonly Image<Rgba32> ExtractionInformationNotExtractable = IconOverlayProvider.GetOverlayNoCache(ExtractionInformationCore, OverlayKind.Delete);	2✔
39
40	public Image<Rgba32> GetImageIfSupportedObject(object o)
41	{
42	if (o is ExtractionCategory cat)	456!
43	return GetImage(cat);	×
44
45	if (o is not ExtractionInformation ei) return null;	840✔
46
47	var toReturn = GetImage(ei.ExtractionCategory);	72✔
48
49	if (ei.IsExtractionIdentifier)	72✔
50	toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier);	34✔
51
52	if (ei.IsPrimaryKey)	72!
53	toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key);	×
54
55	if (ei.HashOnDataRelease)	72!
56	toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);	×
57
58	return toReturn;	72✔
59	}
60
61	private static Image<Rgba32> GetImage(ExtractionCategory category)
62	{
63	return category switch	72!
64	{	72✔
65	ExtractionCategory.Core => ExtractionInformationCore,	72✔
66	ExtractionCategory.Supplemental => ExtractionInformationSupplemental,	×
67	ExtractionCategory.SpecialApprovalRequired => ExtractionInformationSpecialApproval,	×
68	ExtractionCategory.Internal => ExtractionInformationInternalOnly,	×
69	ExtractionCategory.Deprecated => ExtractionInformationDeprecated,	×
70	ExtractionCategory.ProjectSpecific => ExtractionInformationProjectSpecific,	×
71	ExtractionCategory.Any => NoIconAvailable,	×
NEW 72	ExtractionCategory.NotExtractable => ExtractionInformationNotExtractable,	×
UNCOV 73	_ => throw new ArgumentOutOfRangeException(nameof(category))	×
74	};	72✔
75	}
76	}

HicServices / RDMP / 9251646467

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous