Fix some issues

internetarchive · May 24, 2023 · f48810b · f48810b
1 parent 1927e43
commit f48810b
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 31 deletions.
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/app/src/Core/APII.php b/app/src/Core/APII.php
@@ -1378,6 +1378,17 @@ public static function getTemplateData( $templates, $force = false ) {
 				$batch = array_slice( $toLookup, 0, $limit );
 				continue;
 			}
+			if( !empty( $data['error']['code'] ) && $data['error']['code'] == "templatedata-corrupt" ) {
+				if( $limit == 1 ) {
+					self::$cachedTemplateData[$batch[0]] = [ false, time() ];
+					unset( $toLookup[array_search( $batch[0], $toLookup )] );
+					$batch = array_slice( $toLookup, 0, $limit );
+					continue;
+				}
+				$limit = 1;
+				$batch = array_slice( $toLookup, 0, $limit );
+				continue;
+			}
 
 			if( !empty( $data['pages'] ) ) {
 				foreach( $data['pages'] as $pageData ) {

diff --git a/app/src/Core/CiteMap.php b/app/src/Core/CiteMap.php
@@ -317,7 +317,7 @@ protected function buildMap( $mapString = "" ) {
 		if( !$this->useTemplateData && in_array( $this, self::$mapObjects ) ) $this->useTemplateData = true;
 
 		if( $this->informalName != "__GLOBAL__" )
-			$data = API::getTemplateData( [$this->informalName] )[$this->informalName];
+			$data = API::getTemplateData( [ $this->informalName ] )[$this->informalName];
 		else
 			$data = false;
 
@@ -771,7 +771,7 @@ protected static function preloadTemplateSourceBatch( $templates ) {
 
 		if( !$sources ) return false;
 
-		foreach( $sources as $template=>$source ) {
+		foreach( $sources as $template => $source ) {
 			self::$sources[$template] = $source;
 			self::$lastSourceUpdate[$template] = time();
 		}
@@ -1381,7 +1381,9 @@ protected static function getDeadValues( $configArray, $moduleCode ) {
 						break;
 					}
 				}
-			} else $returnArray['__DEFAULT__'] = 'dead';
+			}
+
+			if( empty( $returnArray['__DEFAULT__'] ) ) $returnArray['__DEFAULT__'] = 'dead';
 
 			return $returnArray;
 		} else return false;
@@ -1596,10 +1598,12 @@ public static function setDefaultTemplate( $templateName ) {
 			if( in_array( $templateName, self::$templateList ) ) {
 				self::$globalTemplate = trim( $templateName, '{}' );
 				self::saveMaps();
+
 				return true;
 			} elseif( in_array( "{{{$templateName}}}", self::$templateList ) ) {
 				self::$globalTemplate = $templateName;
 				self::saveMaps();
+
 				return true;
 			}
 
@@ -1773,36 +1777,37 @@ public static function updateMaps() {
 		self::updateDefaultObject();
 
 		$templateLookup = [];
-			foreach( self::$templateList as $template ) {
-				$template = trim( $template, '{}' );
-				$template = API::getTemplateNamespaceName() . ":$template";
-				$templateLookup[] = $template;
-			}
-			$templatesExist = API::pagesExist( $templateLookup );
-			$toLookup = [];
+		foreach( self::$templateList as $template ) {
+			$template = trim( $template, '{}' );
+			$template = API::getTemplateNamespaceName() . ":$template";
+			$templateLookup[] = $template;
+		}
+		$templatesExist = API::pagesExist( $templateLookup );
+		$toLookup = [];
 
-			foreach( $templatesExist as $template => $exists ) {
-				$template = explode( ':', $template, 2 )[1];
-				if( !$exists ) {
-					self::unregisterMapObject( $template );
-					continue;
-				}
-				if( !isset( $citoidData['template_data'][$template] ) ) {
-					$toLookup[] = $template;
-				}
+		foreach( $templatesExist as $template => $exists ) {
+			$template = explode( ':', $template, 2 )[1];
+			if( !$exists ) {
+				self::unregisterMapObject( $template );
+				continue;
 			}
+			if( !isset( $citoidData['template_data'][$template] ) ) {
+				$toLookup[] = $template;
+			}
+		}
 
-			if( !empty( $toLookup ) )
-				$citoidData['template_data'] = array_replace( $citoidData['template_data'], API::getTemplateData( $toLookup ) );
+		if( !empty( $toLookup ) )
+			$citoidData['template_data'] =
+				array_replace( $citoidData['template_data'], API::getTemplateData( $toLookup ) );
 
-			foreach( $citoidData['template_data'] as $template => $exists ) {
-				if( $exists ) {
-					self::registerMapObject( $template );
-					$toPreload[] = API::getTemplateNamespaceName() . ":$template";
-				} elseif( empty( $exists ) ) {
-					self::unregisterMapObject( $template );
-				}
+		foreach( $citoidData['template_data'] as $template => $exists ) {
+			if( $exists ) {
+				self::registerMapObject( $template );
+				$toPreload[] = API::getTemplateNamespaceName() . ":$template";
+			} elseif( empty( $exists ) ) {
+				self::unregisterMapObject( $template );
 			}
+		}
 
 		do {
 			self::$requireUpdate = false;

diff --git a/app/src/Core/Metrics/InfluxDB.php b/app/src/Core/Metrics/InfluxDB.php
@@ -63,8 +63,8 @@ public function initialize( $exceptOnFail = false ): bool {
 			if( $this->usingLegacy ) {
 				$this->client = new \InfluxDB\Client( $this->configuration['host'],
 					$this->configuration['port'],
-					$this->configuration['user'],
-					$this->configuration['password'],
+					@$this->configuration['user'],
+					@$this->configuration['password'],
 					isset( $this->configuration['ssl'] ) &&
 					is_bool( $this->configuration['ssl']
 					) &&