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

General code refactor and reformat.

Browse Source
This commit is contained in:
Natalia Portillo
2018-12-31 13:17:27 +00:00
parent 6b12cd1a8e
commit f2caa8c40f
413 changed files with 3554 additions and 6549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
DiscImageChef.Filters/OffsetStream.cs
View File

@@ -32,10 +32,10 @@
using System;
using System.IO;
using Microsoft.Win32.SafeHandles;
#if !NETSTANDARD2_0
using System.Security.AccessControl;
#endif
using Microsoft.Win32.SafeHandles;
namespace DiscImageChef.Filters
{
@@ -120,40 +120,6 @@ namespace DiscImageChef.Filters
if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
}
#if !NETSTANDARD2_0
public OffsetStream(string path, FileMode mode, FileSystemRights rights, FileShare share,
int bufferSize,
FileOptions options, long start, long end)
{
if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
streamStart = start;
streamEnd = end;
baseStream = new FileStream(path, mode, rights, share, bufferSize, options);
if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
}
public OffsetStream(string path, FileMode mode, FileSystemRights rights, FileShare share,
int bufferSize,
FileOptions options, FileSecurity fileSecurity, long start, long end)
{
if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
streamStart = start;
streamEnd = end;
baseStream = new FileStream(path, mode, rights, share, bufferSize, options, fileSecurity);
if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
}
#endif
public OffsetStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
bool useAsync, long start, long end)
{
@@ -350,20 +316,14 @@ namespace DiscImageChef.Filters
base.Dispose();
}
public override int EndRead(IAsyncResult asyncResult)
{
return baseStream.EndRead(asyncResult);
}
public override int EndRead(IAsyncResult asyncResult) => baseStream.EndRead(asyncResult);
public override void EndWrite(IAsyncResult asyncResult)
{
baseStream.EndWrite(asyncResult);
}
public override int ReadByte()
{
return baseStream.Position == streamEnd + 1 ? -1 : baseStream.ReadByte();
}
public override int ReadByte() => baseStream.Position == streamEnd + 1 ? -1 : baseStream.ReadByte();
public override void WriteByte(byte value)
{
@@ -415,5 +375,39 @@ namespace DiscImageChef.Filters
baseStream.Write(buffer, offset, count);
}
#if !NETSTANDARD2_0
public OffsetStream(string path, FileMode mode, FileSystemRights rights, FileShare share,
int bufferSize,
FileOptions options, long start, long end)
{
if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
streamStart = start;
streamEnd = end;
baseStream = new FileStream(path, mode, rights, share, bufferSize, options);
if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
}
public OffsetStream(string path, FileMode mode, FileSystemRights rights, FileShare share,
int bufferSize,
FileOptions options, FileSecurity fileSecurity, long start, long end)
{
if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
streamStart = start;
streamEnd = end;
baseStream = new FileStream(path, mode, rights, share, bufferSize, options, fileSecurity);
if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
}
#endif
}
}

40
DiscImageChef.Filters/Register.cs
View File

@@ -46,15 +46,9 @@ namespace DiscImageChef.Filters
{
public class Register : IPluginRegister
{
public List<Type> GetAllChecksumPlugins()
{
return null;
}
public List<Type> GetAllChecksumPlugins() => null;
public List<Type> GetAllFilesystemPlugins()
{
return null;
}
public List<Type> GetAllFilesystemPlugins() => null;
public List<Type> GetAllFilterPlugins()
{
@@ -62,34 +56,16 @@ namespace DiscImageChef.Filters
.Where(t => t.IsClass).ToList();
}
public List<Type> GetAllFloppyImagePlugins()
{
return null;
}
public List<Type> GetAllFloppyImagePlugins() => null;
public List<Type> GetAllMediaImagePlugins()
{
return null;
}
public List<Type> GetAllMediaImagePlugins() => null;
public List<Type> GetAllPartitionPlugins()
{
return null;
}
public List<Type> GetAllPartitionPlugins() => null;
public List<Type> GetAllReadOnlyFilesystemPlugins()
{
return null;
}
public List<Type> GetAllReadOnlyFilesystemPlugins() => null;
public List<Type> GetAllWritableFloppyImagePlugins()
{
return null;
}
public List<Type> GetAllWritableFloppyImagePlugins() => null;
public List<Type> GetAllWritableImagePlugins()
{
return null;
}
public List<Type> GetAllWritableImagePlugins() => null;
}
}