7194961165

Committed 13 Dec 2023 12:07PM UTC coverage: 56.776% (-0.2%) from 57.013%

Build # 7194961165

Build Type

push

github

Committed by

web-flow

Commit Message

Merge Latest Release into main (#1702)

* Bump YamlDotNet from 13.3.1 to 13.4.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.3.1 to 13.4.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v13.3.1...v13.4.0)

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

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

* Bump shogo82148/actions-setup-perl from 1.23.1 to 1.24.1

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.23.1 to 1.24.1.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](https://github.com/shogo82148/actions-setup-perl/compare/v1.23.1...v1.24.1)

---
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>

* fix checkbox issue

* improve confirmation text (#1639)

* improve confirmation text
* Loop tidyup, use var where possible

---------

Co-authored-by: jas88 <j.a.sutherland@dundee.ac.uk>

* correct typo in create logging sql (#1640)

* Feature/ci codescan (#1641)

* Move SecurityCodescan.VS2019 to run on Github CI alone, integrate results with CodeQL
* Remove SecurityCodescan from Packages.md, no longer used via Nuget

---------

Co-authored-by: James A Sutherland <j@sutherland.pw>

* hide source control when not available

* Remove old Plugin object bits, tidy up (#1636)

* Remove old Plugin object bits, tidy up

* Purge remaining bits of AllExpiredPluginsNode

* Fix plugin display name in tree

* Update CreateNewDataExtractionProjectUI.cs

Casting fix

* Feature/rdmp42 delete plugins (#1642)

* add ui plugin delete functionality

* Warning and inherita... (continued)

Run Details

10722 of 20351 branches covered (0.0%)

Branch coverage included in aggregate %.

215 of 789 new or added lines in 63 files covered. (27.25%)

39 existing lines in 16 files now uncovered.

30650 of 52518 relevant lines covered (58.36%)

7294.17 hits per line

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

2.08

/Rdmp.Core/Curation/Data/LoadModuleAssembly.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 System.Collections.Generic;
using System.IO;
using System.Linq;
using ICSharpCode.SharpZipLib.Zip;

namespace Rdmp.Core.Curation.Data;

/// <summary>
/// This entity wraps references to plugin .nupkg files on disk.
/// </summary>
public sealed class LoadModuleAssembly
{
    internal static readonly List<LoadModuleAssembly> Assemblies=new();
    private readonly FileInfo _file;

    private LoadModuleAssembly(FileInfo file)
    {
        _file = file;
    }

    /// <summary>
    /// Unpack the plugin DLL files, excluding any Windows UI specific dlls when not running a Windows GUI
    /// </summary>
    internal static IEnumerable<ValueTuple<string, MemoryStream>> GetContents(string path)
    {
        var info = new FileInfo(path);
        if (!info.Exists || info.Length < 100) yield break; // Ignore missing or empty files

        var pluginStream = info.OpenRead();
        Assemblies.Add(new LoadModuleAssembly(info));

        var isWin = AppDomain.CurrentDomain.GetAssemblies()
            .Any(static a => a.FullName?.StartsWith("Rdmp.UI", StringComparison.Ordinal) == true);

        if (!pluginStream.CanSeek)
            throw new ArgumentException("Seek needed", nameof(path));

        using var zip = new ZipFile(pluginStream);
        foreach (var e in zip.Cast<ZipEntry>()
                     .Where(static e => e.IsFile && e.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
                     .Where(e => isWin || !e.Name.Contains("/windows/")))
        {
            using var s = zip.GetInputStream(e);
            using var ms2 = new MemoryStream();
            s.CopyTo(ms2);
            ms2.Position = 0;
            yield return (e.Name, ms2);
        }
    }

    /// <summary>
    /// Copy the plugin nupkg to the given directory
    /// </summary>
    /// <param name="downloadDirectory"></param>
    public string DownloadAssembly(DirectoryInfo downloadDirectory)
    {
        if (!downloadDirectory.Exists)
            downloadDirectory.Create();
        var targetFile=Path.Combine(downloadDirectory.FullName, _file.Name);
        _file.CopyTo(targetFile,true);
        return targetFile;
    }

    public void Delete() => _file.Delete();
    public override string ToString() => _file.Name;
}

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 System.Collections.Generic;
9	using System.IO;
10	using System.Linq;
11	using ICSharpCode.SharpZipLib.Zip;
12
13	namespace Rdmp.Core.Curation.Data;
14
15	/// <summary>
16	/// This entity wraps references to plugin .nupkg files on disk.
17	/// </summary>
18	public sealed class LoadModuleAssembly
19	{
20	internal static readonly List<LoadModuleAssembly> Assemblies=new();	4✔
21	private readonly FileInfo _file;
22
NEW 23	private LoadModuleAssembly(FileInfo file)	×
24	{
NEW 25	_file = file;	×
UNCOV 26	}	×
27
28	/// <summary>
29	/// Unpack the plugin DLL files, excluding any Windows UI specific dlls when not running a Windows GUI
30	/// </summary>
31	internal static IEnumerable<ValueTuple<string, MemoryStream>> GetContents(string path)
32	{
NEW 33	var info = new FileInfo(path);	×
NEW 34	if (!info.Exists \|\| info.Length < 100) yield break; // Ignore missing or empty files	×
35
NEW 36	var pluginStream = info.OpenRead();	×
NEW 37	Assemblies.Add(new LoadModuleAssembly(info));	×
38
UNCOV 39	var isWin = AppDomain.CurrentDomain.GetAssemblies()	×
UNCOV 40	.Any(static a => a.FullName?.StartsWith("Rdmp.UI", StringComparison.Ordinal) == true);	×
41
42	if (!pluginStream.CanSeek)	×
NEW 43	throw new ArgumentException("Seek needed", nameof(path));	×
44
45	using var zip = new ZipFile(pluginStream);	×
46	foreach (var e in zip.Cast<ZipEntry>()	×
47	.Where(static e => e.IsFile && e.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))	×
48	.Where(e => isWin \|\| !e.Name.Contains("/windows/")))	×
49	{
50	using var s = zip.GetInputStream(e);	×
51	using var ms2 = new MemoryStream();	×
52	s.CopyTo(ms2);	×
53	ms2.Position = 0;	×
54	yield return (e.Name, ms2);	×
55	}	×
56	}	×
57
58	/// <summary>
59	/// Copy the plugin nupkg to the given directory
60	/// </summary>
61	/// <param name="downloadDirectory"></param>
62	public string DownloadAssembly(DirectoryInfo downloadDirectory)
63	{
64	if (!downloadDirectory.Exists)	×
65	downloadDirectory.Create();	×
NEW 66	var targetFile=Path.Combine(downloadDirectory.FullName, _file.Name);	×
NEW 67	_file.CopyTo(targetFile,true);	×
UNCOV 68	return targetFile;	×
69	}
70
NEW 71	public void Delete() => _file.Delete();	×
NEW 72	public override string ToString() => _file.Name;	×
73	}

HicServices / RDMP / 7194961165

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