aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Move ImageFormat to Core.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-27 15:17:20 +01:00
parent 4000786a41
commit 0c6617edf8
11 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,14 @@
2017-05-27 Natalia Portillo <claunia@claunia.com>
* Commands/Decode.cs:
* Commands/Verify.cs:
* Commands/Compare.cs:
* Commands/Entropy.cs:
* Commands/Checksum.cs:
* Commands/PrintHex.cs:
* DiscImageChef.csproj:
Refactor: Move ImageFormat to Core.
2017-05-27 Natalia Portillo <claunia@claunia.com>
* Commands/Ls.cs:

1
DiscImageChef/Commands/Checksum.cs
View File

@@ -37,6 +37,7 @@ using System.Collections.Generic;
using DiscImageChef.Console;
using System.Threading;
using DiscImageChef.Filters;
using DiscImageChef.Core;
namespace DiscImageChef.Commands
{

1
DiscImageChef/Commands/Compare.cs
View File

@@ -36,6 +36,7 @@ using System.Text;
using System.Collections.Generic;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.Core;
namespace DiscImageChef.Commands
{

1
DiscImageChef/Commands/Decode.cs
View File

@@ -33,6 +33,7 @@
using DiscImageChef.ImagePlugins;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.Core;
namespace DiscImageChef.Commands
{

1
DiscImageChef/Commands/Entropy.cs
View File

@@ -36,6 +36,7 @@ using DiscImageChef.Checksums;
using System.Collections.Generic;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.Core;
namespace DiscImageChef.Commands
{

1
DiscImageChef/Commands/PrintHex.cs
View File

@@ -33,6 +33,7 @@
using DiscImageChef.ImagePlugins;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.Core;
namespace DiscImageChef.Commands
{

1
DiscImageChef/Commands/Verify.cs
View File

@@ -35,6 +35,7 @@ using DiscImageChef.ImagePlugins;
using System.Collections.Generic;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.Core;
namespace DiscImageChef.Commands
{

114
DiscImageChef/DetectImageFormat.cs
View File

@@ -1,114 +0,0 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : DetectImageFormat.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : Main program loop.
//
// --[ Description ] ----------------------------------------------------------
//
// Detects disc image format.
//
// --[ License ] --------------------------------------------------------------
//
// This program 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.
//
// This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2017 Natalia Portillo
// ****************************************************************************/
using System;
using DiscImageChef.Filters;
using DiscImageChef.Console;
using DiscImageChef.Core;
namespace DiscImageChef.ImagePlugins
{
public static class ImageFormat
{
public static ImagePlugin Detect(Filter imageFilter)
{
try
{
ImagePlugin _imageFormat;
PluginBase plugins = new PluginBase();
plugins.RegisterAllPlugins();
_imageFormat = null;
// Check all but RAW plugin
foreach(ImagePlugin _imageplugin in plugins.ImagePluginsList.Values)
{
if(_imageplugin.PluginUUID != new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
{
try
{
DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", _imageplugin.Name);
if(_imageplugin.IdentifyImage(imageFilter))
{
_imageFormat = _imageplugin;
break;
}
}
#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
catch
#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
{
}
}
}
// Check only RAW plugin
if(_imageFormat == null)
{
foreach(ImagePlugin _imageplugin in plugins.ImagePluginsList.Values)
{
if(_imageplugin.PluginUUID == new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
{
try
{
DicConsole.DebugWriteLine("Format detection", "Trying plugin {0}", _imageplugin.Name);
if(_imageplugin.IdentifyImage(imageFilter))
{
_imageFormat = _imageplugin;
break;
}
}
#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
catch
#pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
{
}
}
}
}
// Still not recognized
if(_imageFormat == null)
{
return null;
}
return _imageFormat;
}
catch
{
return null;
}
}
}
}

1
DiscImageChef/DiscImageChef.csproj
View File

@@ -54,7 +54,6 @@
<Compile Include="Commands\PrintHex.cs" />
<Compile Include="Commands\Decode.cs" />
<Compile Include="Commands\Entropy.cs" />
<Compile Include="DetectImageFormat.cs" />
<Compile Include="Commands\DeviceInfo.cs" />
<Compile Include="Commands\MediaInfo.cs" />
<Compile Include="Commands\Benchmark.cs">