Version 0.0.5

cpk: Fix CRILAYLA header detection (#2)
cpk: Add compressed CRILAYLA sample

Author: mos9527

CriCodecsEx/crilayla.cpp

@@ -22,6 +22,13 @@ See also:
 #include <stdlib.h>
 #include <string.h>
 
+unsigned fourCC(const char a, const char b, const char c, const char d) {
+	return (a << 0) | (b << 8) | (c << 16) | (d << 24);
+};
+const unsigned CRILAYLA_LO = fourCC('C', 'R', 'I', 'L');
+const unsigned CRILAYLA_HI = fourCC('A', 'Y', 'L', 'A');
+const unsigned long long CRILAYLA_MAGIC =  CRILAYLA_LO | (unsigned long long)CRILAYLA_HI << 32uLL;
+
 struct crilayla_header{
     unsigned long long crilayla;
     unsigned int decompress_size;
@@ -186,7 +193,7 @@ unsigned int layla_comp(unsigned char *dest, int *destLen, unsigned char *src, i
         return 0; // Underflow    
     *destLen = *destLen - m; dest += m;
     // CRIL AYLA srcLen-0x100 destLen
-    int l[] = { 0x4c495243,0x414c5941,srcLen - 0x100,*destLen };
+    int l[] = { CRILAYLA_LO,CRILAYLA_HI,srcLen - 0x100,*destLen };
     for (j = 0; j<4; j++)
     {
         for (i = 0; i<4; i++)
@@ -210,7 +217,7 @@ PyObject* CriLaylaDecompress(PyObject* self, PyObject* d){
 	unsigned char *data = (unsigned char *)PyBytes_AsString(d);
 	crilayla_header header = *(crilayla_header*)data;
 
-    if (header.crilayla != 0x414c59434152494cULL) {
+    if (header.crilayla != CRILAYLA_MAGIC) {
         PyErr_SetString(PyExc_ValueError, "Invalid CRILAYLA header.");
         return NULL;
     }

PyCriCodecsEx/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.4"
+__version__ = "0.0.5"

Tests/CPK/README.md

@@ -7,4 +7,9 @@ default.cpk
 │
 └───subdir
         niko-512.png
-```
+```
+### compressed.cpk
+```
+compressed.cpk
+     niko.png
+```

Tests/CPK/compressed.cpk

@@ -2,10 +2,10 @@
 from . import sample_file_path, temp_file_path
 from PyCriCodecsEx.cpk import CPK, CPKBuilder
 
-def test_cpk_unpack():     
+def cpk_unpack(fname):     
     # Extract CPK content
     cpkdir = temp_file_path('cpk')
-    cpk = CPK(sample_file_path('CPK/default.cpk'))
+    cpk = CPK(sample_file_path(fname))
     for f in cpk.files:
         dst = os.path.join(cpkdir, f.path)
         os.makedirs(os.path.dirname(dst), exist_ok=True)
@@ -29,5 +29,12 @@ def progress_callback(stage: str, current: int, total: int):
     cpk.save(temp_file_path('rebuild.cpk'))
     print('Repack done.')
 
+def test_cpk_regular():
+    cpk_unpack('CPK/default.cpk')
+
+def test_cpk_compressed():
+    cpk_unpack('CPK/compressed.cpk')
+
 if __name__ == "__main__":
-    test_cpk_unpack()
+    test_cpk_regular()
+    test_cpk_compressed()

Tests/test_CPK.py

@@ -1,3 +1,5 @@
+# TODO: Fix CRILAYLA Compression
+# Decompression is tested in test_CPK.py
 import os
 from . import sample_file_path, temp_file_path
 from CriCodecsEx import CriLaylaCompress, CriLaylaDecompress