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

72.73

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataLoadDirectory.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.IO;
using Rdmp.Core.Curation;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.DataLoad;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

/// <summary>
/// Creates the expected and required flat file layout for a <see cref="LoadMetadata"/>
/// </summary>
public class ExecuteCommandCreateNewDataLoadDirectory : BasicCommandExecution
{
    /// <summary>
    /// The load if any to create the folder structure for
    /// </summary>
    public LoadMetadata LoadMetadata { get; }

    /// <summary>
    /// The directory to create or null to do the operation
    /// interactively.
    /// </summary>
    public DirectoryInfo Dir { get; }

    public ExecuteCommandCreateNewDataLoadDirectory(IBasicActivateItems activator,
        [DemandsInitialization(
            "Optional load for which you are creating the folder structure.  Will have its LocationOfFlatFiles set to the new dir if passed")]
        LoadMetadata load,
        [DemandsInitialization("The directory to create new load folders in.")]
        DirectoryInfo dir) : base(activator)
    {
        LoadMetadata = load;
        Dir = dir;
    }

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

        var d = Dir;
        string newFolderName = null;

        // if called with an explicit full dir then that is where we create load folders
        // otherwise get them to pick something that exists and then name a new folder to
        // create

        if (d == null)
        {
            d = BasicActivator.SelectDirectory("Directory to create in");

            if (d == null)
                return;

            if (!BasicActivator.TypeText("New Folder Name", "Name", 255, null, out newFolderName, false)) return;
        }

        var loadDir =
            string.IsNullOrWhiteSpace(newFolderName)
                ? LoadDirectory.CreateDirectoryStructure(d.Parent, d.Name, true)
                : LoadDirectory.CreateDirectoryStructure(d, newFolderName, true);

        // if we have a load then update the path to this location we just created
        if (LoadMetadata != null)
        {
            LoadMetadata.LocationOfFlatFiles = loadDir.RootPath.FullName;
            LoadMetadata.SaveToDatabase();
            Publish(LoadMetadata);
        }
    }
}

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.IO;
8	using Rdmp.Core.Curation;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.Curation.Data.DataLoad;
11
12	namespace Rdmp.Core.CommandExecution.AtomicCommands;
13
14	/// <summary>
15	/// Creates the expected and required flat file layout for a <see cref="LoadMetadata"/>
16	/// </summary>
17	public class ExecuteCommandCreateNewDataLoadDirectory : BasicCommandExecution
18	{
19	/// <summary>
20	/// The load if any to create the folder structure for
21	/// </summary>
22	public LoadMetadata LoadMetadata { get; }	10✔
23
24	/// <summary>
25	/// The directory to create or null to do the operation
26	/// interactively.
27	/// </summary>
28	public DirectoryInfo Dir { get; }	4✔
29
30	public ExecuteCommandCreateNewDataLoadDirectory(IBasicActivateItems activator,
31	[DemandsInitialization(
32	"Optional load for which you are creating the folder structure. Will have its LocationOfFlatFiles set to the new dir if passed")]
33	LoadMetadata load,
34	[DemandsInitialization("The directory to create new load folders in.")]
35	DirectoryInfo dir) : base(activator)	4✔
36	{
37	LoadMetadata = load;	4✔
38	Dir = dir;	4✔
39	}	4✔
40
41	public override void Execute()
42	{
43	base.Execute();	4✔
44
45	var d = Dir;	4✔
46	string newFolderName = null;	4✔
47
48	// if called with an explicit full dir then that is where we create load folders
49	// otherwise get them to pick something that exists and then name a new folder to
50	// create
51
52	if (d == null)	4!
53	{
54	d = BasicActivator.SelectDirectory("Directory to create in");	×
55
56	if (d == null)	×
57	return;	×
58
59	if (!BasicActivator.TypeText("New Folder Name", "Name", 255, null, out newFolderName, false)) return;	×
60	}
61
62	var loadDir =	4!
63	string.IsNullOrWhiteSpace(newFolderName)	4✔
64	? LoadDirectory.CreateDirectoryStructure(d.Parent, d.Name, true)	4✔
65	: LoadDirectory.CreateDirectoryStructure(d, newFolderName, true);	4✔
66
67	// if we have a load then update the path to this location we just created
68	if (LoadMetadata != null)	4✔
69	{
70	LoadMetadata.LocationOfFlatFiles = loadDir.RootPath.FullName;	2✔
71	LoadMetadata.SaveToDatabase();	2✔
72	Publish(LoadMetadata);	2✔
73	}
74	}	4✔
75	}

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