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

🐛Added support for Apple II character sets, fixes #102

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-26 18:52:21 +00:00
parent 56198b1ee6
commit 41180352de
10 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -600,7 +600,6 @@
<e p="ext2FS.cs" t="Include" /> <e p="ext2FS.cs" t="Include" />
<e p="extFS.cs" t="Include" /> <e p="extFS.cs" t="Include" />
<e p="obj" t="ExcludeRecursive" /> <e p="obj" t="ExcludeRecursive" />
<e p="packages.config" t="Include" />
</e> </e>
<e p="DiscImageChef.Filters" t="IncludeRecursive"> <e p="DiscImageChef.Filters" t="IncludeRecursive">
<e p="AppleDouble.cs" t="Include" /> <e p="AppleDouble.cs" t="Include" />

3
DiscImageChef.Filesystems/AppleDOS/Info.cs
View File

@@ -66,8 +66,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding) Encoding encoding)
{ {
// TODO: Until Apple ][ encoding is implemented Encoding = encoding ?? new Apple2();
Encoding = new LisaRoman();
information = ""; information = "";
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

3
DiscImageChef.Filesystems/AppleDOS/Super.cs
View File

@@ -50,8 +50,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
{ {
device = imagePlugin; device = imagePlugin;
start = partition.Start; start = partition.Start;
// TODO: Until Apple ][ encoding is implemented Encoding = encoding ?? new Apple2();
Encoding = new LisaRoman();
if(device.Info.Sectors != 455 && device.Info.Sectors != 560) if(device.Info.Sectors != 455 && device.Info.Sectors != 560)
{ {

9
DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj
View File

@@ -31,11 +31,11 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Claunia.Encoding, Version=1.0.6569.33160, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Claunia.Encoding.1.3.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Claunia.Encoding">
<HintPath>..\packages\Claunia.Encoding.1.2.9.1\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="IReadOnlyFilesystem.cs" /> <Compile Include="IReadOnlyFilesystem.cs" />
@@ -215,9 +215,6 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="CPM\cpmdefs.xml" /> <EmbeddedResource Include="CPM\cpmdefs.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>

3
DiscImageChef.Filesystems/ProDOS.cs
View File

@@ -153,8 +153,7 @@ namespace DiscImageChef.Filesystems
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding) Encoding encoding)
{ {
// TODO: Until Apple ][ encoding is implemented Encoding = encoding ?? new Apple2gs();
Encoding = new LisaRoman();
StringBuilder sbInformation = new StringBuilder(); StringBuilder sbInformation = new StringBuilder();
// Blocks 0 and 1 are boot code // Blocks 0 and 1 are boot code

3
DiscImageChef.Filesystems/UCSDPascal/Info.cs
View File

@@ -32,9 +32,11 @@
using System; using System;
using System.Text; using System.Text;
using Claunia.Encoding;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.DiscImages; using DiscImageChef.DiscImages;
using Schemas; using Schemas;
using Encoding = System.Text.Encoding;
namespace DiscImageChef.Filesystems.UCSDPascal namespace DiscImageChef.Filesystems.UCSDPascal
{ {
@@ -86,6 +88,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding) Encoding encoding)
{ {
Encoding = encoding ?? new Apple2();
StringBuilder sbInformation = new StringBuilder(); StringBuilder sbInformation = new StringBuilder();
information = ""; information = "";

3
DiscImageChef.Filesystems/UCSDPascal/Super.cs
View File

@@ -46,8 +46,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, bool debug) public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, bool debug)
{ {
device = imagePlugin; device = imagePlugin;
// TODO: Until Apple ][ encoding is implemented Encoding = encoding ?? new Apple2();
Encoding = new LisaRoman();
this.debug = debug; this.debug = debug;
if(device.Info.Sectors < 3) return Errno.InvalidArgument; if(device.Info.Sectors < 3) return Errno.InvalidArgument;

3
DiscImageChef.Filesystems/packages.config
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Claunia.Encoding" version="1.2.9.1" targetFramework="net40" /> <package id="Claunia.Encoding" version="1.3.0" targetFramework="net40" />
</packages> </packages>

6
DiscImageChef/DiscImageChef.csproj
View File

@@ -34,6 +34,9 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Claunia.Encoding, Version=1.0.6569.33160, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Claunia.Encoding.1.3.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96"> <Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
<HintPath>..\packages\SharpCompress.0.19.2\lib\net35\SharpCompress.dll</HintPath> <HintPath>..\packages\SharpCompress.0.19.2\lib\net35\SharpCompress.dll</HintPath>
</Reference> </Reference>
@@ -43,9 +46,6 @@
<HintPath>..\packages\CommandLineParser.2.1.1-beta\lib\net40\CommandLine.dll</HintPath> <HintPath>..\packages\CommandLineParser.2.1.1-beta\lib\net40\CommandLine.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Claunia.Encoding">
<HintPath>..\packages\Claunia.Encoding.1.2.9.1\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Main.cs" /> <Compile Include="Main.cs" />

7
DiscImageChef/packages.config
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Claunia.Encoding" version="1.2.9.1" targetFramework="net40" /> <package id="Claunia.Encoding" version="1.3.0" targetFramework="net40" />
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net40" /> <package id="CommandLineParser" version="2.1.1-beta" targetFramework="net40" />
<package id="SharpCompress" version="0.19.2" targetFramework="net40" /> <package id="SharpCompress" version="0.19.2" targetFramework="net40" />
</packages> </packages>