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

10.0

/Rdmp.Core/DataExport/DataExtraction/Pipeline/FileExtractor.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.Data;
using Rdmp.Core.DataExport.DataExtraction.Commands;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.DataFlowPipeline.Requirements;
using Rdmp.Core.ReusableLibraryCode.Checks;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataExport.DataExtraction.Pipeline;

/// <summary>
/// Extraction component for extracting (and optionally transforming in some way) arbitrary files on disk as part of an extraction
/// </summary>
public abstract class FileExtractor : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<IExtractCommand>
{
    protected ExtractGlobalsCommand _command { get; set; }

    private bool _isFirstTime = true;

    public virtual void Abort(IDataLoadEventListener listener)
    {
    }

    public virtual void Check(ICheckNotifier notifier)
    {
    }

    public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
    {
    }

    public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)
    {
        // We only want to extract the files once so let's do it as part of extracting globals
        _command = value as ExtractGlobalsCommand;
    }

    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
        GracefulCancellationToken cancellationToken)
    {
        if (_command == null)
        {
            listener.OnNotify(this,
                new NotifyEventArgs(ProgressEventType.Information,
                    $"Ignoring {GetType().Name} component because command is not ExtractGlobalsCommand"));
            return toProcess;
        }

        if (_isFirstTime)
            MoveFiles(_command, listener, cancellationToken);

        _isFirstTime = false;

        return toProcess;
    }

    /// <summary>
    /// Gets called once only per extraction pipeline run (at the time globals start being extracted)
    /// </summary>
    /// <param name="command"></param>
    /// <param name="listener"></param>
    /// <param name="cancellationToken"></param>
    protected abstract void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener,
        GracefulCancellationToken cancellationToken);
}

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.Data;
9	using Rdmp.Core.DataExport.DataExtraction.Commands;
10	using Rdmp.Core.DataFlowPipeline;
11	using Rdmp.Core.DataFlowPipeline.Requirements;
12	using Rdmp.Core.ReusableLibraryCode.Checks;
13	using Rdmp.Core.ReusableLibraryCode.Progress;
14
15	namespace Rdmp.Core.DataExport.DataExtraction.Pipeline;
16
17	/// <summary>
18	/// Extraction component for extracting (and optionally transforming in some way) arbitrary files on disk as part of an extraction
19	/// </summary>
20	public abstract class FileExtractor : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<IExtractCommand>
21	{
22	protected ExtractGlobalsCommand _command { get; set; }	×
23
24	private bool _isFirstTime = true;	16✔
25
26	public virtual void Abort(IDataLoadEventListener listener)
27	{
28	}	×
29
30	public virtual void Check(ICheckNotifier notifier)
31	{
32	}	16✔
33
34	public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
35	{
36	}	×
37
38	public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)
39	{
40	// We only want to extract the files once so let's do it as part of extracting globals
41	_command = value as ExtractGlobalsCommand;	×
42	}	×
43
44	public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
45	GracefulCancellationToken cancellationToken)
46	{
47	if (_command == null)	×
48	{
49	listener.OnNotify(this,	×
50	new NotifyEventArgs(ProgressEventType.Information,	×
51	$"Ignoring {GetType().Name} component because command is not ExtractGlobalsCommand"));	×
52	return toProcess;	×
53	}
54
55	if (_isFirstTime)	×
56	MoveFiles(_command, listener, cancellationToken);	×
57
58	_isFirstTime = false;	×
59
60	return toProcess;	×
61	}
62
63	/// <summary>
64	/// Gets called once only per extraction pipeline run (at the time globals start being extracted)
65	/// </summary>
66	/// <param name="command"></param>
67	/// <param name="listener"></param>
68	/// <param name="cancellationToken"></param>
69	protected abstract void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener,
70	GracefulCancellationToken cancellationToken);
71	}

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