claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ALL] File and namespace reorg

Browse Source
This commit is contained in:
Matt Nadareski
2017-10-06 20:46:43 -07:00
parent 249e64bdbb
commit 5475764fdf
32 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RombaSharp/Partials/RombaSharp.Helpers.cs
View File

@@ -5,9 +5,9 @@ using System.Linq;
using System.Xml;
using Mono.Data.Sqlite;
using SabreTools.Library;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO

4
RombaSharp/Partials/RombaSharp.Inits.cs
View File

@@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using Mono.Data.Sqlite;
using SabreTools.Library;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO

1
RombaSharp/RombaSharp.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using SabreTools.Library;
using SabreTools.Library.Data;
using SabreTools.Library.Help;
using SabreTools.Library.Tools;

3
SabreTools.Library/Dats/Partials/DatFile.ConvertUpdate.cs → SabreTools.Library/DatFiles/DatFile.ConvertUpdate.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO
@@ -15,7 +16,7 @@ using SearchOption = System.IO.SearchOption;
#endif
using NaturalSort;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

3
SabreTools.Library/Dats/Partials/DatFile.DFD.cs → SabreTools.Library/DatFiles/DatFile.DFD.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO
@@ -16,7 +17,7 @@ using SearchOption = System.IO.SearchOption;
#endif
using SharpCompress.Common;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

3
SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs → SabreTools.Library/DatFiles/DatFile.Manipulate.cs
View File

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using System.Web;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
#if MONO
using System.IO;
@@ -13,7 +14,7 @@ using System.IO;
using Alphaleonis.Win32.Filesystem;
#endif
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

3
SabreTools.Library/Dats/Partials/DatFile.Parsers.cs → SabreTools.Library/DatFiles/DatFile.Parsers.cs
View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using System.Xml;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO
@@ -17,7 +18,7 @@ using Alphaleonis.Win32.Filesystem;
using StreamReader = System.IO.StreamReader;
#endif
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

3
SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs → SabreTools.Library/DatFiles/DatFile.Rebuild.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Skippers;
using SabreTools.Library.Tools;
@@ -19,7 +20,7 @@ using SeekOrigin = System.IO.SeekOrigin;
using Stream = System.IO.Stream;
#endif
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

3
SabreTools.Library/Dats/Partials/DatFile.Splitters.cs → SabreTools.Library/DatFiles/DatFile.Splitters.cs
View File

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using System.Web;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO
@@ -14,7 +15,7 @@ using Alphaleonis.Win32.Filesystem;
#endif
using NaturalSort;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

3
SabreTools.Library/Dats/Partials/DatFile.Statistics.cs → SabreTools.Library/DatFiles/DatFile.Statistics.cs
View File

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using System.Web;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO
@@ -16,7 +17,7 @@ using SearchOption = System.IO.SearchOption;
using StreamWriter = System.IO.StreamWriter;
#endif
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
/*
* TODO: Make output standard width (HTML, without making the entire thing a table)

3
SabreTools.Library/Dats/Partials/DatFile.Writers.cs → SabreTools.Library/DatFiles/DatFile.Writers.cs
View File

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using System.Web;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
using SabreTools.Library.Tools;
#if MONO
@@ -19,7 +20,7 @@ using StreamWriter = System.IO.StreamWriter;
#endif
using NaturalSort;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

6
SabreTools.Library/Dats/DatFile.cs → SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public partial class DatFile
{

2
SabreTools.Library/Dats/DatHeader.cs → SabreTools.Library/DatFiles/DatHeader.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public class DatHeader : ICloneable
{

3
SabreTools.Library/Dats/DatStats.cs → SabreTools.Library/DatFiles/DatStats.cs
View File

@@ -1,8 +1,9 @@
using System;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public class DatStats
{

3
SabreTools.Library/Dats/Filter.cs → SabreTools.Library/DatFiles/Filter.cs
View File

@@ -3,8 +3,9 @@ using System.Collections.Generic;
using System.Text.RegularExpressions;
using SabreTools.Library.Data;
using SabreTools.Library.Items;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.DatFiles
{
public class Filter
{

2
SabreTools.Library/Data/Globals.cs
View File

@@ -2,6 +2,8 @@
using System.Reflection;
using System.Threading.Tasks;
using SabreTools.Library.Tools;
#if MONO
using System.IO;
#else

2
SabreTools.Library/Dats/Archive.cs → SabreTools.Library/Items/Archive.cs
View File

@@ -1,7 +1,7 @@
using System;
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class Archive : DatItem
{

2
SabreTools.Library/Dats/BiosSet.cs → SabreTools.Library/Items/BiosSet.cs
View File

@@ -1,7 +1,7 @@
using System;
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class BiosSet : DatItem
{

4
SabreTools.Library/Dats/DatItem.cs → SabreTools.Library/Items/DatItem.cs
View File

@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SabreTools.Library.Data;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Tools;
#if MONO
@@ -12,7 +12,7 @@ using Alphaleonis.Win32.Filesystem;
#endif
using NaturalSort;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public abstract class DatItem : IEquatable<DatItem>, IComparable<DatItem>, ICloneable
{

2
SabreTools.Library/Dats/Disk.cs → SabreTools.Library/Items/Disk.cs
View File

@@ -2,7 +2,7 @@
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class Disk : DatItem
{

2
SabreTools.Library/Dats/Machine.cs → SabreTools.Library/Items/Machine.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class Machine : ICloneable
{

2
SabreTools.Library/Dats/Release.cs → SabreTools.Library/Items/Release.cs
View File

@@ -2,7 +2,7 @@
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class Release : DatItem
{

2
SabreTools.Library/Dats/Rom.cs → SabreTools.Library/Items/Rom.cs
View File

@@ -2,7 +2,7 @@
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class Rom : Disk, ICloneable
{

2
SabreTools.Library/Dats/Sample.cs → SabreTools.Library/Items/Sample.cs
View File

@@ -2,7 +2,7 @@
using SabreTools.Library.Data;
namespace SabreTools.Library.Dats
namespace SabreTools.Library.Items
{
public class Sample : DatItem
{

48
SabreTools.Library/SabreTools.Library.csproj
View File

@@ -115,17 +115,17 @@
<Compile Include="Data\Constants.cs" />
<Compile Include="Data\Flags.cs" />
<Compile Include="Data\Globals.cs" />
<Compile Include="Dats\DatHeader.cs" />
<Compile Include="Dats\DatStats.cs" />
<Compile Include="Dats\Partials\DatFile.Manipulate.cs" />
<Compile Include="Dats\Partials\DatFile.ConvertUpdate.cs" />
<Compile Include="Dats\Partials\DatFile.DFD.cs" />
<Compile Include="Dats\Partials\DatFile.Parsers.cs" />
<Compile Include="Dats\Filter.cs" />
<Compile Include="Dats\Partials\DatFile.Rebuild.cs" />
<Compile Include="Dats\Partials\DatFile.Splitters.cs" />
<Compile Include="Dats\Partials\DatFile.Statistics.cs" />
<Compile Include="Dats\Partials\DatFile.Writers.cs" />
<Compile Include="DatFiles\DatHeader.cs" />
<Compile Include="DatFiles\DatStats.cs" />
<Compile Include="DatFiles\DatFile.Manipulate.cs" />
<Compile Include="DatFiles\DatFile.ConvertUpdate.cs" />
<Compile Include="DatFiles\DatFile.DFD.cs" />
<Compile Include="DatFiles\DatFile.Parsers.cs" />
<Compile Include="DatFiles\Filter.cs" />
<Compile Include="DatFiles\DatFile.Rebuild.cs" />
<Compile Include="DatFiles\DatFile.Splitters.cs" />
<Compile Include="DatFiles\DatFile.Statistics.cs" />
<Compile Include="DatFiles\DatFile.Writers.cs" />
<Compile Include="External\CoreRarArchive.cs" />
<Compile Include="External\NaturalSort\NaturalComparer.cs" />
<Compile Include="External\NaturalSort\NaturalReversedComparer.cs" />
@@ -145,27 +145,27 @@
<Compile Include="External\Zlib\ZlibCodec.cs" />
<Compile Include="External\Zlib\ZlibConstants.cs" />
<Compile Include="External\Zlib\ZlibStream.cs" />
<Compile Include="Dats\Archive.cs" />
<Compile Include="Dats\BiosSet.cs" />
<Compile Include="Dats\DatFile.cs" />
<Compile Include="Dats\DatItem.cs" />
<Compile Include="Dats\Disk.cs" />
<Compile Include="Dats\Machine.cs" />
<Compile Include="Dats\Release.cs" />
<Compile Include="Dats\Sample.cs" />
<Compile Include="Dats\Rom.cs" />
<Compile Include="Items\Archive.cs" />
<Compile Include="Items\BiosSet.cs" />
<Compile Include="DatFiles\DatFile.cs" />
<Compile Include="Items\DatItem.cs" />
<Compile Include="Items\Disk.cs" />
<Compile Include="Items\Machine.cs" />
<Compile Include="Items\Release.cs" />
<Compile Include="Items\Sample.cs" />
<Compile Include="Items\Rom.cs" />
<Compile Include="External\SupportedFiles\ZipFileEntry.cs" />
<Compile Include="External\SupportedFiles\ZipFile.cs" />
<Compile Include="Help\Feature.cs" />
<Compile Include="Help\Help.cs" />
<Compile Include="Skippers\Skipper.cs" />
<Compile Include="Skippers\SkipperRule.cs" />
<Compile Include="InternalStopwatch.cs" />
<Compile Include="Tools\InternalStopwatch.cs" />
<Compile Include="Tools\ArchiveTools.cs" />
<Compile Include="Tools\FileTools.cs" />
<Compile Include="Tools\DatabaseTools.cs" />
<Compile Include="Data\Enums.cs" />
<Compile Include="Logger.cs" />
<Compile Include="Tools\Logger.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tools\Style.cs" />
<Compile Include="Data\Build.cs" />
@@ -203,7 +203,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="Dats\Partials\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets" Condition="Exists('..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets')" />
<Target Name="EnsureMonoDataSqlitePortableImported" BeforeTargets="BeforeBuild" Condition="'$(MonoDataSqlitePortableImported)' == ''">

2
SabreTools.Library/Tools/ArchiveTools.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text.RegularExpressions;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.Items;
#if MONO
using System.IO;

2
SabreTools.Library/Tools/FileTools.cs
View File

@@ -6,8 +6,8 @@ using System.Xml;
using System.Xml.Schema;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.External;
using SabreTools.Library.Items;
using SabreTools.Library.Skippers;
#if MONO

2
SabreTools.Library/InternalStopwatch.cs → SabreTools.Library/Tools/InternalStopwatch.cs
View File

@@ -2,7 +2,7 @@
using SabreTools.Library.Data;
namespace SabreTools.Library
namespace SabreTools.Library.Tools
{
/// <summary>
/// Stopwatch class for keeping track of duration in the code

2
SabreTools.Library/Logger.cs → SabreTools.Library/Tools/Logger.cs
View File

@@ -13,7 +13,7 @@ using FileStream = System.IO.FileStream;
using StreamWriter = System.IO.StreamWriter;
#endif
namespace SabreTools.Library
namespace SabreTools.Library.Tools
{
/// <summary>
/// Log either to file or to the console

2
SabreTools.Library/Tools/Style.cs
View File

@@ -7,7 +7,7 @@ using System.Text.RegularExpressions;
using System.Web;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.DatFiles;
#if MONO
using System.IO;

4
SabreTools/Partials/SabreTools.Inits.cs
View File

@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SabreTools.Library;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Tools;
#if MONO

3
SabreTools/SabreTools.cs
View File

@@ -2,9 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using SabreTools.Library;
using SabreTools.Library.Data;
using SabreTools.Library.Dats;
using SabreTools.Library.DatFiles;
using SabreTools.Library.Help;
using SabreTools.Library.Tools;