comparison faptool.php @ 964:280dc9b01297

Moar work.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 29 Nov 2014 03:29:13 +0200
parents 003af1c4ae1f
children eea2b92287ca
comparison
equal deleted inserted replaced
963:003af1c4ae1f 964:280dc9b01297
383 } 383 }
384 384
385 if (wtMakeDir(stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"])), 0755) === false) 385 if (wtMakeDir(stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"])), 0755) === false)
386 return FALSE; 386 return FALSE;
387 387
388 $dstFileBase = $useOrig ? $efile["id"]."--".$efile["origname"] : $efile["filename"]; 388 $dstFileBase = $entry["show_id"]."--".($useOrig ? $efile["origname"] : $efile["filename"]);
389 389
390 if ($edata["class"] == EFILE_ARCHIVE) 390 if ($edata["class"] == EFILE_ARCHIVE)
391 { 391 {
392 // Entry is an archive file .. 392 // Entry is an archive file ..
393 $dstPath = stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"], stReplaceFileExt($dstFileBase, ""))); 393 $dstPath = stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"], stReplaceFileExt($dstFileBase, "")));
394 if (wtUnpackArchiveTo($efile["filetype"], $filename, $dstPath) === false) 394 if (wtUnpackArchiveTo($edata["id"], $filename, $dstPath) === false)
395 return FALSE; 395 return FALSE;
396 } 396 }
397 else 397 else
398 { 398 {
399 $dstFilename = stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"], $dstFileBase)); 399 $dstFilename = stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"], $dstFileBase));