[Data Liberation] Reorganize reader classes

Desc TBD
WordPress · Dec 17, 2024 · abad470 · abad470
1 parent 2d0198a
commit abad470
Show file tree

Hide file tree

Showing 18 changed files with 471 additions and 579 deletions.
diff --git a/packages/playground/data-liberation/blueprints-library b/packages/playground/data-liberation/blueprints-library
diff --git a/packages/playground/data-liberation/bootstrap.php b/packages/playground/data-liberation/bootstrap.php
@@ -11,11 +11,19 @@
 require_once __DIR__ . '/blueprints-library/src/WordPress/AsyncHttp/Connection.php';
 require_once __DIR__ . '/blueprints-library/src/WordPress/AsyncHttp/Client.php';
 
-require_once __DIR__ . '/src/byte-readers/WP_Byte_Reader.php';
-require_once __DIR__ . '/src/byte-readers/WP_File_Reader.php';
-require_once __DIR__ . '/src/byte-readers/WP_GZ_File_Reader.php';
-require_once __DIR__ . '/src/byte-readers/WP_Remote_File_Reader.php';
-require_once __DIR__ . '/src/byte-readers/WP_Remote_File_Ranged_Reader.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/Filesystem/WP_Abstract_Filesystem.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/Filesystem/WP_Filesystem.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/Filesystem/WP_File_Visitor_Event.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/Filesystem/WP_Filesystem_Visitor.php';
+
+require_once __DIR__ . '/blueprints-library/src/WordPress/ByteReader/WP_Byte_Reader.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/ByteReader/WP_File_Reader.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/ByteReader/WP_GZ_File_Reader.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/ByteReader/WP_Remote_File_Reader.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/ByteReader/WP_Remote_File_Ranged_Reader.php';
+
+require_once __DIR__ . '/blueprints-library/src/WordPress/Zip/ZipStreamReader.php';
+require_once __DIR__ . '/blueprints-library/src/WordPress/Zip/WP_Zip_Filesystem.php';
 
 if (
 	! class_exists( 'WP_HTML_Tag_Processor' ) &&
@@ -48,27 +56,28 @@
 require_once __DIR__ . '/src/block-markup/WP_Block_Markup_Processor.php';
 require_once __DIR__ . '/src/block-markup/WP_Block_Markup_Url_Processor.php';
 require_once __DIR__ . '/src/block-markup/WP_URL_In_Text_Processor.php';
-require_once __DIR__ . '/src/block-markup/WP_HTML_To_Blocks.php';
 require_once __DIR__ . '/src/block-markup/WP_URL.php';
+require_once __DIR__ . '/src/block-markup/WP_HTML_To_Blocks.php';
+
+require_once __DIR__ . '/src/entity-readers/WP_Entity_Reader.php';
+require_once __DIR__ . '/src/entity-readers/WP_HTML_Entity_Reader.php';
+require_once __DIR__ . '/src/entity-readers/WP_EPub_Entity_Reader.php';
+require_once __DIR__ . '/src/entity-readers/WP_WXR_Entity_Reader.php';
+require_once __DIR__ . '/src/entity-readers/WP_Directory_Tree_Entity_Reader.php';
 
 require_once __DIR__ . '/src/xml-api/WP_XML_Decoder.php';
 require_once __DIR__ . '/src/xml-api/WP_XML_Processor.php';
-require_once __DIR__ . '/src/wxr/WP_WXR_Reader.php';
-require_once __DIR__ . '/src/import/WP_Import_Utils.php';
 require_once __DIR__ . '/src/import/WP_Block_Object.php';
 require_once __DIR__ . '/src/import/WP_Entity_Importer.php';
-require_once __DIR__ . '/src/import/WP_File_Visitor.php';
-require_once __DIR__ . '/src/import/WP_File_Visitor_Event.php';
 require_once __DIR__ . '/src/import/WP_Imported_Entity.php';
 require_once __DIR__ . '/src/import/WP_Attachment_Downloader.php';
 require_once __DIR__ . '/src/import/WP_Attachment_Downloader_Event.php';
 require_once __DIR__ . '/src/import/WP_Import_Session.php';
 require_once __DIR__ . '/src/import/WP_Stream_Importer.php';
 require_once __DIR__ . '/src/import/WP_Entity_Iterator_Chain.php';
 require_once __DIR__ . '/src/import/WP_Retry_Frontloading_Iterator.php';
-require_once __DIR__ . '/src/entity-readers/WP_Entity_Reader.php';
-require_once __DIR__ . '/src/entity-readers/WP_HTML_Entity_Reader.php';
-
+require_once __DIR__ . '/src/import/WP_Import_HTML_Processor.php';
+require_once __DIR__ . '/src/import/WP_Import_Utils.php';
 require_once __DIR__ . '/src/utf8_decoder.php';
 
 // When running in Playground, the composer autoloader script sees CLI SAPI and

diff --git a/packages/playground/data-liberation/dist/data-liberation-core.phar.gz b/packages/playground/data-liberation/dist/data-liberation-core.phar.gz
diff --git a/packages/playground/data-liberation/phpunit.xml b/packages/playground/data-liberation/phpunit.xml
@@ -2,10 +2,11 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuites>
     <testsuite name="Application Test Suite">
-      <file>tests/WPHTMLEntityReaderTests.php</file>
-      <file>tests/WPHTMLToBlocksTests.php</file>
       <file>tests/WPWXRReaderTests.php</file>
       <file>tests/WPRewriteUrlsTests.php</file>
+      <file>tests/WPHTMLToBlocksTests.php</file>
+      <file>tests/WPHTMLEntityReaderTests.php</file>
+      <file>tests/WPEPubEntityReaderTests.php</file>
       <file>tests/WPURLInTextProcessorTests.php</file>
       <file>tests/WPBlockMarkupProcessorTests.php</file>
       <file>tests/WPBlockMarkupUrlProcessorTests.php</file>

diff --git a/packages/playground/data-liberation/project.json b/packages/playground/data-liberation/project.json
@@ -33,7 +33,7 @@
 			"options": {
 				"cwd": "packages/playground/data-liberation",
 				"commands": [
-					"./vendor/bin/phpcs --standard=./phpcs.xml -s ./src ./*.php"
+					"./vendor/bin/phpcs --standard=./phpcs.xml -s ./src ./*.php "
 				],
 				"parallel": false
 			}
@@ -43,7 +43,7 @@
 			"options": {
 				"cwd": "packages/playground/data-liberation",
 				"commands": [
-					"./vendor/bin/phpcbf --standard=./phpcs.xml ./src ./*.php"
+					"./vendor/bin/phpcbf --standard=./phpcs.xml ./src ./*.php "
 				],
 				"parallel": false
 			}

diff --git a/packages/playground/data-liberation/src/byte-readers/WP_Byte_Reader.php b/packages/playground/data-liberation/src/byte-readers/WP_Byte_Reader.php
diff --git a/packages/playground/data-liberation/src/byte-readers/WP_File_Reader.php b/packages/playground/data-liberation/src/byte-readers/WP_File_Reader.php
diff --git a/packages/playground/data-liberation/src/byte-readers/WP_GZ_File_Reader.php b/packages/playground/data-liberation/src/byte-readers/WP_GZ_File_Reader.php