6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

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

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

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.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 Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

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

0.0

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingDocument.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.Linq;
using Rdmp.Core.CommandExecution.Combining;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.Repositories;
using Rdmp.Core.Repositories.Construction;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandAddNewSupportingDocument : BasicCommandExecution, IAtomicCommand
{
    private readonly FileCollectionCombineable _fileCollectionCombineable;
    private readonly Catalogue _targetCatalogue;

    [UseWithObjectConstructor]
    public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator, Catalogue catalogue) : base(activator)
    {
        _targetCatalogue = catalogue;
    }

    public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator,
        FileCollectionCombineable fileCollectionCombineable, Catalogue targetCatalogue) : base(activator)
    {
        _fileCollectionCombineable = fileCollectionCombineable;
        _targetCatalogue = targetCatalogue;
        var allExisting = targetCatalogue.GetAllSupportingDocuments(FetchOptions.AllGlobalsAndAllLocals);

        foreach (var doc in allExisting)
        {
            var filename = doc.GetFileName();

            if (filename == null)
                continue;

            var collisions = _fileCollectionCombineable.Files.FirstOrDefault(f =>
                f.FullName.Equals(filename.FullName, StringComparison.CurrentCultureIgnoreCase));

            if (collisions != null)
                SetImpossible($"File '{collisions.Name}' is already a SupportingDocument (ID={doc.ID} - '{doc.Name}')");
        }
    }

    public override string GetCommandHelp() =>
        "Marks a file on disk as useful for understanding the dataset and (optionally) copies into project extractions";

    public override void Execute()
    {
        base.Execute();

        var c = _targetCatalogue;

        if (c == null)
        {
            if (BasicActivator.SelectObject(new DialogArgs
            {
                WindowTitle = "Add SupportingDocument",
                TaskDescription = "Select which Catalogue you want to add the SupportingDocument to."
            }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
                c = selected;
            else
                // user cancelled selecting a Catalogue
                return;
        }

        var files = _fileCollectionCombineable != null
            ? _fileCollectionCombineable.Files
            : new[] { BasicActivator.SelectFile("File to add") };

        if (files == null || files.All(f => f == null))
            return;

        var created = new List<SupportingDocument>();
        foreach (var f in files)
        {
            var doc = new SupportingDocument((ICatalogueRepository)c.Repository, c, f.Name)
            {
                URL = new Uri(f.FullName)
            };
            doc.SaveToDatabase();
            created.Add(doc);
        }

        Publish(c);

        Emphasise(created.Last());

        foreach (var doc in created)
            Activate(doc);
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
        iconProvider.GetImage(RDMPConcept.SupportingDocument, OverlayKind.Add);
}

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.Linq;
10	using Rdmp.Core.CommandExecution.Combining;
11	using Rdmp.Core.Curation.Data;
12	using Rdmp.Core.Icons.IconProvision;
13	using Rdmp.Core.Repositories;
14	using Rdmp.Core.Repositories.Construction;
15	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
16	using SixLabors.ImageSharp;
17	using SixLabors.ImageSharp.PixelFormats;
18
19	namespace Rdmp.Core.CommandExecution.AtomicCommands;
20
21	public class ExecuteCommandAddNewSupportingDocument : BasicCommandExecution, IAtomicCommand
22	{
23	private readonly FileCollectionCombineable _fileCollectionCombineable;
24	private readonly Catalogue _targetCatalogue;
25
26	[UseWithObjectConstructor]
27	public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator, Catalogue catalogue) : base(activator)	×
28	{
29	_targetCatalogue = catalogue;	×
30	}	×
31
32	public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator,
33	FileCollectionCombineable fileCollectionCombineable, Catalogue targetCatalogue) : base(activator)	×
34	{
35	_fileCollectionCombineable = fileCollectionCombineable;	×
36	_targetCatalogue = targetCatalogue;	×
37	var allExisting = targetCatalogue.GetAllSupportingDocuments(FetchOptions.AllGlobalsAndAllLocals);	×
38
39	foreach (var doc in allExisting)	×
40	{
41	var filename = doc.GetFileName();	×
42
43	if (filename == null)	×
44	continue;
45
46	var collisions = _fileCollectionCombineable.Files.FirstOrDefault(f =>	×
47	f.FullName.Equals(filename.FullName, StringComparison.CurrentCultureIgnoreCase));	×
48
49	if (collisions != null)	×
50	SetImpossible($"File '{collisions.Name}' is already a SupportingDocument (ID={doc.ID} - '{doc.Name}')");	×
51	}
52	}	×
53
54	public override string GetCommandHelp() =>
55	"Marks a file on disk as useful for understanding the dataset and (optionally) copies into project extractions";	×
56
57	public override void Execute()
58	{
59	base.Execute();	×
60
61	var c = _targetCatalogue;	×
62
63	if (c == null)	×
64	{
65	if (BasicActivator.SelectObject(new DialogArgs	×
66	{	×
67	WindowTitle = "Add SupportingDocument",	×
68	TaskDescription = "Select which Catalogue you want to add the SupportingDocument to."	×
69	}, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))	×
70	c = selected;	×
71	else
72	// user cancelled selecting a Catalogue
73	return;	×
74	}
75
76	var files = _fileCollectionCombineable != null	×
77	? _fileCollectionCombineable.Files	×
78	: new[] { BasicActivator.SelectFile("File to add") };	×
79
80	if (files == null \|\| files.All(f => f == null))	×
81	return;	×
82
83	var created = new List<SupportingDocument>();	×
84	foreach (var f in files)	×
85	{
86	var doc = new SupportingDocument((ICatalogueRepository)c.Repository, c, f.Name)	×
87	{	×
88	URL = new Uri(f.FullName)	×
89	};	×
90	doc.SaveToDatabase();	×
91	created.Add(doc);	×
92	}
93
94	Publish(c);	×
95
96	Emphasise(created.Last());	×
97
98	foreach (var doc in created)	×
99	Activate(doc);	×
100	}	×
101
102	public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
103	iconProvider.GetImage(RDMPConcept.SupportingDocument, OverlayKind.Add);	×
104	}

HicServices / RDMP / 6245535001

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