Added support for LisaFS v2.

DiscImageChef.Filesystems/LisaFS/Dir.cs

@@ -93,6 +93,68 @@ namespace DiscImageChef.Filesystems.LisaFS
             if(catalogCache.TryGetValue(fileId, out catalog))
                 return Errno.NoError;
 
+            Errno error;
+
+            if(mddf.fsversion == LisaFSv2)
+            {
+                if(fileId != FILEID_DIRECTORY)
+                {
+                    ExtentFile ext;
+                    error = ReadExtentsFile(fileId, out ext);
+                    if(error == Errno.NoError)
+                        return Errno.NotDirectory;
+                }
+
+                byte[] buf;
+                error = ReadFile(4, out buf);
+
+                int offset = 0;
+                List<CatalogEntryV2> catalogV2 = new List<CatalogEntryV2>();
+
+                while(offset + 54 < buf.Length)
+                {
+                    CatalogEntryV2 entV2 = new CatalogEntryV2();
+                    entV2.filenameLen = buf[offset];
+                    entV2.filename = new byte[E_NAME];
+                    Array.Copy(buf, offset + 0x01, entV2.filename, 0, E_NAME);
+                    entV2.unknown1 = buf[offset + 0x21];
+                    entV2.fileType = buf[offset + 0x22];
+                    entV2.unknown2 = buf[offset + 0x23];
+                    entV2.fileID = BigEndianBitConverter.ToInt16(buf, offset + 0x24);
+                    entV2.unknown3 = new byte[16];
+                    Array.Copy(buf, offset + 0x26, entV2.unknown3, 0, 16);
+
+                    offset += 54;
+
+                    if(entV2.filenameLen != 0 && entV2.filenameLen <= E_NAME && entV2.fileType != 0 && entV2.fileID > 0)
+                        catalogV2.Add(entV2);
+                }
+
+                catalog = new List<CatalogEntry>();
+
+                foreach(CatalogEntryV2 entV2 in catalogV2)
+                {
+                    ExtentFile ext;
+                    error = ReadExtentsFile(entV2.fileID, out ext);
+                    if(error == Errno.NoError)
+                    {
+                        CatalogEntry entV3 = new CatalogEntry();
+                        entV3.fileID = entV2.fileID;
+                        entV3.filename = new byte[32];
+                        Array.Copy(entV2.filename, 0, entV3.filename, 0, entV2.filenameLen);
+                        entV3.fileType = entV2.fileType;
+                        entV3.length = (int)srecords[entV2.fileID].filesize;
+                        entV3.dtc = ext.dtc;
+                        entV3.dtm = ext.dtm;
+
+                        catalog.Add(entV3);
+                    }
+                }
+
+                catalogCache.Add(fileId, catalog);
+                return Errno.NoError;
+            }
+
             byte[] firstCatalogBlock = null;
 
             for(ulong i = 0; i < device.GetSectors(); i++)

DiscImageChef.Filesystems/LisaFS/Extent.cs

@@ -62,7 +62,7 @@ namespace DiscImageChef.Filesystems.LisaFS
             if(!mounted)
                 return Errno.AccessDenied;
 
-            if(fileId < 5)
+            if(fileId < 4 || (fileId == 4 && mddf.fsversion != LisaFSv2))
                 return Errno.InvalidArgument;
 
             if(extentCache.TryGetValue(fileId, out file))

DiscImageChef.Filesystems/LisaFS/File.cs

@@ -390,7 +390,7 @@ namespace DiscImageChef.Filesystems.LisaFS
 
             tags &= debug;
 
-            if(fileId <= 4)
+            if(fileId < 4 || (fileId == 4 && mddf.fsversion != LisaFSv2))
                 return Errno.InvalidArgument;
 
             if(!tags && fileCache.TryGetValue(fileId, out buf))

DiscImageChef.Filesystems/LisaFS/Structs.cs

@@ -369,6 +369,24 @@ namespace DiscImageChef.Filesystems.LisaFS
             /// <summary>0x0C, some kind of flags, meaning unknown</summary>
             public UInt16 flags;
         }
+
+        struct CatalogEntryV2
+        {
+            /// <summary>0x00, filename, 32-bytes, null-padded</summary>
+            public byte filenameLen;
+            /// <summary>0x01, filename, 31-bytes</summary>
+            public byte[] filename;
+            /// <summary>0x21, unknown</summary>
+            public byte unknown1;
+            /// <summary>0x22, unknown</summary>
+            public byte fileType;
+            /// <summary>0x23, unknown</summary>
+            public byte unknown2;
+            /// <summary>0x24, unknown</summary>
+            public Int16 fileID;
+            /// <summary>0x26, 16 bytes, unknown</summary>
+            public byte[] unknown3;
+        }
     }
 }
 

DiscImageChef.Filesystems/LisaFS/Super.cs

@@ -188,21 +188,19 @@ namespace DiscImageChef.Filesystems.LisaFS
                             return Errno.InvalidArgument;
                         }
 
-                        if(mddf.fsversion != LisaFSv3)
-                        {
-                            string version = mddf.fsversion.ToString();
-
                         switch(mddf.fsversion)
                         {
                             case LisaFSv1:
-                                    version = "v1";
+                                DicConsole.ErrorWriteLine("Cannot mount LisaFS v1");
-                                    break;
+                                return Errno.NotSupported;
                             case LisaFSv2:
-                                    version = "v2";
+                                DicConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v2");
                                 break;
-                            }
+                            case LisaFSv3:
-
+                                DicConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v2");
-                            DicConsole.DebugWriteLine("LisaFS plugin", "Cannot mount LisaFS version {0}", version);
+                                break;
+                            default:
+                                DicConsole.ErrorWriteLine("Cannot mount LisaFS version {0}", mddf.fsversion.ToString());
                                 return Errno.NotSupported;
                         }