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

66.67

/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/DeleteCachedFilesOperation.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 Rdmp.Core.DataLoad.Engine.Job.Scheduling;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Engine.DataProvider.FromCache;

/// <summary>
/// UpdateProgressIfLoadsuccessful (See UpdateProgressIfLoadsuccessful) which also deletes files in the ForLoading directory that were generated during the
/// load e.g. by a CachedFileRetriever.  Files are only deleted if the ExitCodeType.Success otherwise they are left in ForLoading for debugging / inspection.
/// </summary>
public class DeleteCachedFilesOperation : UpdateProgressIfLoadsuccessful
{
    private readonly Dictionary<DateTime, FileInfo> _cacheFileMappings;

    public DeleteCachedFilesOperation(ScheduledDataLoadJob job, Dictionary<DateTime, FileInfo> cacheFileMappings)
        : base(job)
    {
        _cacheFileMappings = cacheFileMappings;
    }

    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
    {
        if (exitCode != ExitCodeType.Success)
            return;

        base.LoadCompletedSoDispose(exitCode, postLoadEventListener);

        foreach (var value in _cacheFileMappings.Values.Where(value => value != null))
            try
            {
                value.Delete();
            }
            catch (IOException e)
            {
                Job.LogWarning(GetType().FullName,
                    $"Could not delete cached file {value} ({e.Message}) - make sure to delete it manually otherwise Schedule and file system will be out of sync");
            }
    }
}

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 Rdmp.Core.DataLoad.Engine.Job.Scheduling;
12	using Rdmp.Core.ReusableLibraryCode.Progress;
13
14	namespace Rdmp.Core.DataLoad.Engine.DataProvider.FromCache;
15
16	/// <summary>
17	/// UpdateProgressIfLoadsuccessful (See UpdateProgressIfLoadsuccessful) which also deletes files in the ForLoading directory that were generated during the
18	/// load e.g. by a CachedFileRetriever. Files are only deleted if the ExitCodeType.Success otherwise they are left in ForLoading for debugging / inspection.
19	/// </summary>
20	public class DeleteCachedFilesOperation : UpdateProgressIfLoadsuccessful
21	{
22	private readonly Dictionary<DateTime, FileInfo> _cacheFileMappings;
23
24	public DeleteCachedFilesOperation(ScheduledDataLoadJob job, Dictionary<DateTime, FileInfo> cacheFileMappings)
25	: base(job)	2✔
26	{
27	_cacheFileMappings = cacheFileMappings;	2✔
28	}	2✔
29
30	public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
31	{
32	if (exitCode != ExitCodeType.Success)	2!
33	return;	×
34
35	base.LoadCompletedSoDispose(exitCode, postLoadEventListener);	2✔
36
37	foreach (var value in _cacheFileMappings.Values.Where(value => value != null))	10✔
38	try
39	{
40	value.Delete();	2✔
41	}	2✔
42	catch (IOException e)	×
43	{
44	Job.LogWarning(GetType().FullName,	×
45	$"Could not delete cached file {value} ({e.Message}) - make sure to delete it manually otherwise Schedule and file system will be out of sync");	×
46	}	×
47	}	2✔
48	}

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