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/ExecuteCommandCreateNewFileBasedProcessTask.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.IO;
using Rdmp.Core.Curation;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.Icons.IconOverlays;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.Repositories;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandCreateNewFileBasedProcessTask : BasicCommandExecution
{
    private readonly ProcessTaskType _taskType;
    private readonly LoadMetadata _loadMetadata;
    private readonly LoadStage _loadStage;
    private readonly LoadDirectory _loadDirectory;
    private FileInfo _file;

    public ExecuteCommandCreateNewFileBasedProcessTask(IBasicActivateItems activator, ProcessTaskType taskType,
        LoadMetadata loadMetadata, LoadStage loadStage, FileInfo file = null) : base(activator)
    {
        _taskType = taskType;
        _loadMetadata = loadMetadata;
        _loadStage = loadStage;

        try
        {
            _loadDirectory = new LoadDirectory(_loadMetadata.LocationOfFlatFiles);
        }
        catch (Exception)
        {
            SetImpossible("Could not construct LoadDirectory");
        }

        if (taskType is not (ProcessTaskType.SQLFile or ProcessTaskType.Executable))
            SetImpossible("Only SQLFile and Executable task types are supported by this command");

        if (!ProcessTask.IsCompatibleStage(taskType, loadStage))
            SetImpossible($"You cannot run {taskType} in {loadStage}");

        _file = file;
    }

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

        if (_file == null)
        {
            if (_taskType == ProcessTaskType.SQLFile)
            {
                if (BasicActivator.TypeText("Enter a name for the SQL file", "File name", 100, "myscript.sql",
                        out var selected, false))
                {
                    var target = Path.Combine(_loadDirectory.ExecutablesPath.FullName, selected);

                    if (!target.EndsWith(".sql"))
                        target += ".sql";

                    //create it if it doesn't exist
                    if (!File.Exists(target))
                        File.WriteAllText(target, "/*todo Type some SQL*/");

                    _file = new FileInfo(target);
                }
                else
                {
                    return; //user cancelled
                }
            }
            else if (_taskType == ProcessTaskType.Executable)
            {
                _file = BasicActivator.SelectFile("Enter executable's path", "Executables", "*.exe");

                // they didn't pick one
                if (_file == null)
                    return;

                if (!_file.Exists)
                    throw new FileNotFoundException("File did not exist");
            }
            else
            {
                throw new ArgumentOutOfRangeException($"Unexpected _taskType:{_taskType}");
            }
        }

        var task = new ProcessTask((ICatalogueRepository)_loadMetadata.Repository, _loadMetadata, _loadStage)
        {
            ProcessTaskType = _taskType,
            Path = _file.FullName
        };
        SaveAndShow(task);
    }

    private void SaveAndShow(ProcessTask task)
    {
        task.Name = $"Run '{Path.GetFileName(task.Path)}'";
        task.SaveToDatabase();

        Publish(_loadMetadata);
        Activate(task);
    }

    public override string GetCommandName()
    {
        return _taskType switch
        {
            ProcessTaskType.Executable => "Add Run .exe File Task",
            ProcessTaskType.SQLFile => "Add Run SQL Script Task",
            _ => throw new ArgumentOutOfRangeException()
        };
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
    {
        return _taskType switch
        {
            ProcessTaskType.SQLFile => iconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Add),
            ProcessTaskType.Executable => IconOverlayProvider.GetOverlayNoCache(
                Image.Load<Rgba32>(CatalogueIcons.Exe), OverlayKind.Add),
            _ => null
        };
    }
}

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.IO;
9	using Rdmp.Core.Curation;
10	using Rdmp.Core.Curation.Data.DataLoad;
11	using Rdmp.Core.Icons.IconOverlays;
12	using Rdmp.Core.Icons.IconProvision;
13	using Rdmp.Core.Repositories;
14	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
15	using SixLabors.ImageSharp;
16	using SixLabors.ImageSharp.PixelFormats;
17
18	namespace Rdmp.Core.CommandExecution.AtomicCommands;
19
20	public class ExecuteCommandCreateNewFileBasedProcessTask : BasicCommandExecution
21	{
22	private readonly ProcessTaskType _taskType;
23	private readonly LoadMetadata _loadMetadata;
24	private readonly LoadStage _loadStage;
25	private readonly LoadDirectory _loadDirectory;
26	private FileInfo _file;
27
28	public ExecuteCommandCreateNewFileBasedProcessTask(IBasicActivateItems activator, ProcessTaskType taskType,
29	LoadMetadata loadMetadata, LoadStage loadStage, FileInfo file = null) : base(activator)	×
30	{
31	_taskType = taskType;	×
32	_loadMetadata = loadMetadata;	×
33	_loadStage = loadStage;	×
34
35	try
36	{
37	_loadDirectory = new LoadDirectory(_loadMetadata.LocationOfFlatFiles);	×
38	}	×
39	catch (Exception)	×
40	{
41	SetImpossible("Could not construct LoadDirectory");	×
42	}	×
43
44	if (taskType is not (ProcessTaskType.SQLFile or ProcessTaskType.Executable))	×
45	SetImpossible("Only SQLFile and Executable task types are supported by this command");	×
46
47	if (!ProcessTask.IsCompatibleStage(taskType, loadStage))	×
48	SetImpossible($"You cannot run {taskType} in {loadStage}");	×
49
50	_file = file;	×
51	}	×
52
53	public override void Execute()
54	{
55	base.Execute();	×
56
57	if (_file == null)	×
58	{
59	if (_taskType == ProcessTaskType.SQLFile)	×
60	{
61	if (BasicActivator.TypeText("Enter a name for the SQL file", "File name", 100, "myscript.sql",	×
62	out var selected, false))	×
63	{
64	var target = Path.Combine(_loadDirectory.ExecutablesPath.FullName, selected);	×
65
66	if (!target.EndsWith(".sql"))	×
67	target += ".sql";	×
68
69	//create it if it doesn't exist
70	if (!File.Exists(target))	×
71	File.WriteAllText(target, "/todo Type some SQL/");	×
72
73	_file = new FileInfo(target);	×
74	}
75	else
76	{
77	return; //user cancelled	×
78	}
79	}
80	else if (_taskType == ProcessTaskType.Executable)	×
81	{
82	_file = BasicActivator.SelectFile("Enter executable's path", "Executables", "*.exe");	×
83
84	// they didn't pick one
85	if (_file == null)	×
86	return;	×
87
88	if (!_file.Exists)	×
89	throw new FileNotFoundException("File did not exist");	×
90	}
91	else
92	{
93	throw new ArgumentOutOfRangeException($"Unexpected _taskType:{_taskType}");	×
94	}
95	}
96
97	var task = new ProcessTask((ICatalogueRepository)_loadMetadata.Repository, _loadMetadata, _loadStage)	×
98	{	×
99	ProcessTaskType = _taskType,	×
100	Path = _file.FullName	×
101	};	×
102	SaveAndShow(task);	×
103	}	×
104
105	private void SaveAndShow(ProcessTask task)
106	{
107	task.Name = $"Run '{Path.GetFileName(task.Path)}'";	×
108	task.SaveToDatabase();	×
109
110	Publish(_loadMetadata);	×
111	Activate(task);	×
112	}	×
113
114	public override string GetCommandName()
115	{
116	return _taskType switch	×
117	{	×
118	ProcessTaskType.Executable => "Add Run .exe File Task",	×
119	ProcessTaskType.SQLFile => "Add Run SQL Script Task",	×
120	_ => throw new ArgumentOutOfRangeException()	×
121	};	×
122	}
123
124	public override Image<Rgba32> GetImage(IIconProvider iconProvider)
125	{
126	return _taskType switch	×
127	{	×
128	ProcessTaskType.SQLFile => iconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Add),	×
129	ProcessTaskType.Executable => IconOverlayProvider.GetOverlayNoCache(	×
130	Image.Load<Rgba32>(CatalogueIcons.Exe), OverlayKind.Add),	×
131	_ => null	×
132	};	×
133	}
134	}

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