Merge pull request egbot#51 from BioKIC/master

Media Remapping tool debugging
BioKIC · Feb 27, 2023 · 965101f · 965101f
2 parents 0636cce + fcbca6f
commit 965101f
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/classes/MediaResolutionTools.php b/classes/MediaResolutionTools.php
@@ -289,13 +289,13 @@ public function migrateCollectionDerivatives($imgIdStart, $limit){
 								if($this->transferThumbnail){
 									$fileName = basename($r->thumbnailurl);
 									$targetPath = $this->imgRootPath.$pathFrag.$fileName;
-									$thumnPath = $this->getLocalPath($r->thumbnailurl);
-									if(copy($thumnPath, $targetPath)){
+									$thumbPath = $this->getLocalPath($r->thumbnailurl);
+									if(copy($thumbPath, $targetPath)){
 										$imgArr[$r->imgid]['tn'] = $targetPath;
-										if($this->debugMode) $this->logOrEcho('Copied: '.$thumnPath.' => '.$targetPath,1);
+										if($this->debugMode) $this->logOrEcho('Copied: '.$thumbPath.' => '.$targetPath,1);
 										if($this->deleteSource){
-											if(unlink($thumnPath)){
-												$this->logOrEcho('Source removed: '.$thumnPath,1);
+											if(unlink($thumbPath)){
+												$this->logOrEcho('Source removed: '.$thumbPath,1);
 											}
 										}
 									}
@@ -358,15 +358,10 @@ private function getLocalPath($imageUrl){
 			$adjustedUrl = str_replace($GLOBALS['IMAGE_ROOT_URL'], $GLOBALS['IMAGE_ROOT_PATH'], $imageUrl);
 			if(file_exists($adjustedUrl)) return $adjustedUrl;
 		}
-		$sourcePathPrefix = '';
-		$fragArr = explode('/', $imageUrl);
-		while($fragArr){
-			$sourcePathPrefix .= '/'.array_shift($fragArr);
-			$testPath = $GLOBALS['IMAGE_ROOT_PATH'].'/'.implode('/', $fragArr);
-			if(file_exists($testPath)){
-				$this->sourcePathPrefix = $sourcePathPrefix;
-				return $testPath;
-			}
+		$prefix = substr($GLOBALS['IMAGE_ROOT_PATH'], 0, strlen($GLOBALS['IMAGE_ROOT_PATH']) - strlen($GLOBALS['IMAGE_ROOT_URL']));
+		if(file_exists($prefix.$imageUrl)){
+			$this->sourcePathPrefix = $prefix;
+			return $prefix.$imageUrl;
 		}
 		return $imageUrl;
 	}