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

64.1

/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DeleteForLoadingFilesOperation.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 System.Linq;
using Rdmp.Core.DataLoad.Engine.Job;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components;

/// <summary>
/// DLE post load disposal operation which deletes all the files in the ForLoading directory.  This is added to the disposal stack and should be executed
/// after the archiving of ForLoading (See ArchiveFiles).
/// </summary>
public class DeleteForLoadingFilesOperation : IDisposeAfterDataLoad
{
    private readonly IDataLoadJob _job;

    public DeleteForLoadingFilesOperation(IDataLoadJob job)
    {
        _job = job;
    }


    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
    {
        // We only delete ForLoading files after a successful load
        if (exitCode == ExitCodeType.Success)
        {
            var LoadDirectory = _job.LoadDirectory;

            //if there are no files and there are no directories
            if (!LoadDirectory.ForLoading.GetFiles().Any() && !LoadDirectory.ForLoading.GetDirectories().Any())
            {
                //just skip it but tell user you are skipping it
                postLoadEventListener.OnNotify(this,
                    new NotifyEventArgs(ProgressEventType.Information,
                        "No files found in ForLoading so not bothering to try and delete."));
                return;
            }

            // Check if the attacher has communicated its intent to handle archiving
            var archivingHandledByAttacher =
                File.Exists(Path.Combine(LoadDirectory.ForLoading.FullName, "attacher_is_handling_archiving"));

            if (!archivingHandledByAttacher && !ArchiveHasBeenCreated())
            {
                postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                    $"Refusing to delete files in ForLoading: the load has reported success but there is no archive of this dataset (was expecting the archive to be called '{_job.ArchiveFilepath}', check LoadMetadata.CacheArchiveType if the file extension is not what you expect)"));
                return;
            }

            _job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                $"Deleting files in ForLoading ({LoadDirectory.ForLoading.FullName})"));

            if (archivingHandledByAttacher)
            {
                LoadDirectory.ForLoading.EnumerateFiles().Where(info => info.Name != "attacher_is_handling_archiving")
                    .ToList().ForEach(info => info.Delete());
                LoadDirectory.ForLoading.EnumerateDirectories().Where(info => info.Name != "__hidden_from_archiver__")
                    .ToList().ForEach(info => info.Delete(true));
            }
            else
            {
                LoadDirectory.ForLoading.EnumerateFiles().ToList().ForEach(info => info.Delete());
                LoadDirectory.ForLoading.EnumerateDirectories().ToList().ForEach(info => info.Delete(true));
            }
        }
    }

    private bool ArchiveHasBeenCreated() => new FileInfo(_job.ArchiveFilepath).Exists;
}

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 System.Linq;
9	using Rdmp.Core.DataLoad.Engine.Job;
10	using Rdmp.Core.ReusableLibraryCode.Progress;
11
12	namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components;
13
14	/// <summary>
15	/// DLE post load disposal operation which deletes all the files in the ForLoading directory. This is added to the disposal stack and should be executed
16	/// after the archiving of ForLoading (See ArchiveFiles).
17	/// </summary>
18	public class DeleteForLoadingFilesOperation : IDisposeAfterDataLoad
19	{
20	private readonly IDataLoadJob _job;
21
22	public DeleteForLoadingFilesOperation(IDataLoadJob job)	46✔
23	{
24	_job = job;	46✔
25	}	46✔
26
27
28	public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
29	{
30	// We only delete ForLoading files after a successful load
31	if (exitCode == ExitCodeType.Success)	44✔
32	{
33	var LoadDirectory = _job.LoadDirectory;	42✔
34
35	//if there are no files and there are no directories
36	if (!LoadDirectory.ForLoading.GetFiles().Any() && !LoadDirectory.ForLoading.GetDirectories().Any())	42!
37	{
38	//just skip it but tell user you are skipping it
39	postLoadEventListener.OnNotify(this,	×
40	new NotifyEventArgs(ProgressEventType.Information,	×
41	"No files found in ForLoading so not bothering to try and delete."));	×
42	return;	×
43	}
44
45	// Check if the attacher has communicated its intent to handle archiving
46	var archivingHandledByAttacher =	42✔
47	File.Exists(Path.Combine(LoadDirectory.ForLoading.FullName, "attacher_is_handling_archiving"));	42✔
48
49	if (!archivingHandledByAttacher && !ArchiveHasBeenCreated())	42!
50	{
51	postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,	×
52	$"Refusing to delete files in ForLoading: the load has reported success but there is no archive of this dataset (was expecting the archive to be called '{_job.ArchiveFilepath}', check LoadMetadata.CacheArchiveType if the file extension is not what you expect)"));	×
53	return;	×
54	}
55
56	_job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,	42✔
57	$"Deleting files in ForLoading ({LoadDirectory.ForLoading.FullName})"));	42✔
58
59	if (archivingHandledByAttacher)	42!
60	{
61	LoadDirectory.ForLoading.EnumerateFiles().Where(info => info.Name != "attacher_is_handling_archiving")	×
62	.ToList().ForEach(info => info.Delete());	×
63	LoadDirectory.ForLoading.EnumerateDirectories().Where(info => info.Name != "__hidden_from_archiver__")	×
64	.ToList().ForEach(info => info.Delete(true));	×
65	}
66	else
67	{
68	LoadDirectory.ForLoading.EnumerateFiles().ToList().ForEach(info => info.Delete());	42✔
69	LoadDirectory.ForLoading.EnumerateDirectories().ToList().ForEach(info => info.Delete(true));	84✔
70	}
71	}
72	}	44✔
73
74	private bool ArchiveHasBeenCreated() => new FileInfo(_job.ArchiveFilepath).Exists;	42✔
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