codemasher / wildstar-database

src/ArchiveExtractor.php

Spacing +19 added lines, -19 removed lines

@@ -20,7 +20,7 @@ 
 
 use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
 
-class ArchiveExtractor implements LoggerAwareInterface{
+class ArchiveExtractor implements LoggerAwareInterface {
 	use LoggerAwareTrait;
 
 	public const ARCHIVES = ['ClientData', 'ClientDataDE', 'ClientDataEN', 'ClientDataFR'];
@@ -47,9 +47,9 @@ 
 	 *
 	 * @throws \codemasher\WildstarDB\WSDBException
 	 */
-	public function __construct(LoggerInterface $logger){
+	public function __construct(LoggerInterface $logger) {
 
-		if(!\extension_loaded('xz')){
+		if (!\extension_loaded('xz')) {
 			throw new WSDBException('required extension xz missing!');
 		}
 
@@ -68,7 +68,7 @@ 
 	public function open(string $index):ArchiveExtractor{
 		$this->archivename = \str_replace(['.index', '.archive'], '', \basename($index));
 
-		if(!in_array($this->archivename, $this::ARCHIVES)){
+		if (!in_array($this->archivename, $this::ARCHIVES)) {
 			throw new WSDBException('invalid archive file (Steam Wildstar not supported)');
 		}
 
@@ -90,14 +90,14 @@ 
 		$this->destination = \rtrim($destination ?? $this->archivepath, '\\/');
 
 		// does the destination parent exist?
-		if(!$this->destination || !\file_exists(\dirname($this->destination))){
+		if (!$this->destination || !\file_exists(\dirname($this->destination))) {
 			throw new WSDBException('invalid destination: '.$this->destination);
 		}
 
 		// destination does not exist?
-		if(!\file_exists($this->destination)){
+		if (!\file_exists($this->destination)) {
 			// is the parent writable?
-			if(!\is_writable(\dirname($this->destination))){
+			if (!\is_writable(\dirname($this->destination))) {
 				throw new WSDBException('destination parent is not writable');
 			}
 			// create it
@@ -105,14 +105,14 @@ 
 		}
 
 		// destination exists but isn't writable?
-		if(!\is_writable($this->destination)){
+		if (!\is_writable($this->destination)) {
 			throw new WSDBException('destination is not writable');
 		}
 
 		$this->fh       = \fopen($this->archivepath.'.archive', 'rb');
 		$this->warnings = [];
 
-		foreach($this->AIDX->data as $item){
+		foreach ($this->AIDX->data as $item) {
 			$this->read($item);
 		}
 
@@ -128,12 +128,12 @@ 
 	 */
 	protected function read(ArchiveItemAbstract $item):void{
 
-		if($item instanceof ArchiveDirectory){
+		if ($item instanceof ArchiveDirectory) {
 
-			foreach($item->Content as $dir){
+			foreach ($item->Content as $dir) {
 				$dest = $this->destination.$dir->Parent;
 
-				if(!\file_exists($dest)){
+				if (!\file_exists($dest)) {
 					\mkdir($dest, 0777, true);
 				}
 
@@ -154,7 +154,7 @@ 
 	protected function extractFile(ArchiveFile $file):void{
 		$dest = $this->destination.$file->Parent.$file->Name;
 
-		if(\file_exists($dest)){ // @todo: overwrite option
+		if (\file_exists($dest)) { // @todo: overwrite option
 			$this->logger->notice('file already exists: '.$dest);
 			return;
 		}
@@ -166,27 +166,27 @@ 
 		$content = \fread($this->fh, $block['Size']);
 
 		// hash the read data
-		if(\sha1($content) !== $file->Hash){
+		if (\sha1($content) !== $file->Hash) {
 			throw new WSDBException('corrupt data, invalid hash: '.\sha1($content).' (expected '.$file->Hash.' for '.$file->Name.')');
 		}
 
 		// $Flags is supposed to be a bitmask
-		if($file->Flags === 1){ // no compression
+		if ($file->Flags === 1) { // no compression
 			$bytesWritten = \file_put_contents($dest, $content);
 		}
-		elseif($file->Flags === 3){ // deflate (probably unsed)
+		elseif ($file->Flags === 3) { // deflate (probably unsed)
 			$bytesWritten = \file_put_contents($dest, \gzinflate($content));
 		}
-		elseif($file->Flags === 5){ // lzma (requires ext-xz)
+		elseif ($file->Flags === 5) { // lzma (requires ext-xz)
 			// https://bitbucket.org/mugadr_m/wildstar-studio/issues/23
 			$content      = \substr($content, 0, 5).\pack('Q', $file->SizeUncompressed).\substr($content, 5);
 			$bytesWritten = \file_put_contents($dest, \xzdecode($content));
 		}
-		else{
+		else {
 			throw new WSDBException('invalid file flag');
 		}
 
-		if($bytesWritten !== $file->SizeUncompressed){
+		if ($bytesWritten !== $file->SizeUncompressed) {
 			$this->warnings[$file->Hash] = $file;
 			// throw new WSDBException
 			$this->logger->warning('size discrepancy for '.$dest.', expected '.$file->SizeUncompressed.' got '.$bytesWritten);

Braces +3 added lines, -6 removed lines

@@ -173,16 +173,13 @@
 		// $Flags is supposed to be a bitmask
 		if($file->Flags === 1){ // no compression
 			$bytesWritten = \file_put_contents($dest, $content);
-		}
-		elseif($file->Flags === 3){ // deflate (probably unsed)
+		} elseif($file->Flags === 3){ // deflate (probably unsed)
 			$bytesWritten = \file_put_contents($dest, \gzinflate($content));
-		}
-		elseif($file->Flags === 5){ // lzma (requires ext-xz)
+		} elseif($file->Flags === 5){ // lzma (requires ext-xz)
 			// https://bitbucket.org/mugadr_m/wildstar-studio/issues/23
 			$content      = \substr($content, 0, 5).\pack('Q', $file->SizeUncompressed).\substr($content, 5);
 			$bytesWritten = \file_put_contents($dest, \xzdecode($content));
-		}
-		else{
+		} else{
 			throw new WSDBException('invalid file flag');
 		}