mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

ZippedResourcePack: detect location of manifest.json if it's not in the root

Browse Source 
this isn't quite as bulletproof as I'd like it to be, but it should work...
This commit is contained in:
Dylan K. Taylor 2020-05-15 19:41:45 +01:00
parent 35747874f6
commit f3e436592a
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/resourcepacks/ZippedResourcePack.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\resourcepacks; namespace pocketmine\resourcepacks;
use Ahc\Json\Comment as CommentedJsonDecoder; use Ahc\Json\Comment as CommentedJsonDecoder;
use function assert;
use function count; use function count;
use function fclose; use function fclose;
use function feof; use function feof;
@ -35,6 +36,8 @@ use function fseek;
use function gettype; use function gettype;
use function hash_file; use function hash_file;
use function implode; use function implode;
use function preg_match;
use function strlen;
class ZippedResourcePack implements ResourcePack{ class ZippedResourcePack implements ResourcePack{
@ -85,7 +88,22 @@ class ZippedResourcePack implements ResourcePack{
} }
if(($manifestData = $archive->getFromName("manifest.json")) === false){ if(($manifestData = $archive->getFromName("manifest.json")) === false){
if($archive->locateName("pack_manifest.json") !== false){ $manifestPath = null;
$manifestIdx = null;
for($i = 0; $i < $archive->numFiles; ++$i){
$name = $archive->getNameIndex($i);
if(
($manifestPath === null or strlen($name) < strlen($manifestPath)) and
preg_match('#.*/manifest.json$#', $name) === 1
){
$manifestPath = $name;
$manifestIdx = $i;
}
}
if($manifestIdx !== null){
$manifestData = $archive->getFromIndex($manifestIdx);
assert($manifestData !== false);
}elseif($archive->locateName("pack_manifest.json") !== false){
throw new ResourcePackException("Unsupported old pack format"); throw new ResourcePackException("Unsupported old pack format");
}else{ }else{
throw new ResourcePackException("manifest.json not found in the archive root"); throw new ResourcePackException("manifest.json not found in the archive root");