Adding space-id-to-space-key map

Author: DvogelHallowelt

src/Analyzer/ConfluenceAnalyzer.php

@@ -95,6 +95,7 @@ public function __construct( $config, Workspace $workspace, DataBuckets $buckets
 		parent::__construct( $config, $workspace, $buckets );
 		$this->customBuckets = new DataBuckets( [
 			'space-id-to-prefix-map',
+			'space-id-to-space-key-map',
 			'space-key-to-prefix-map',
 			'space-name-to-prefix-map',
 			'space-id-to-name-map',
@@ -351,6 +352,9 @@ private function buildSpaceMaps( DOMDocument $dom ): void {
 		$this->customBuckets->addData(
 			'space-key-to-prefix-map', $spaceKey, $customSpacePrefix, false, true
 		);
+		$this->customBuckets->addData(
+			'space-id-to-space-key-map', $spaceId, $spaceKey, false, true
+		);
 		$this->customBuckets->addData(
 			'space-name-to-prefix-map', $spaceName, $customSpacePrefix, false, true
 		);
@@ -619,6 +623,7 @@ private function buildUserMap( DOMDocument $dom ): void {
 	 */
 	private function buildPageMaps( DOMDocument $dom ): void {
 		$spaceIdToPrefixMap = $this->customBuckets->getBucketData( 'space-id-to-prefix-map' );
+		$spaceIdToSpaceKeyMap = $this->customBuckets->getBucketData( 'space-id-to-space-key-map' );
 		$spaceIdHomepages = $this->customBuckets->getBucketData( 'space-id-homepages' );
 		$pageIdParentPageIdMap = $this->customBuckets->getBucketData( 'page-id-to-parent-page-id-map' );
 		$pageIdConfluendTitleMap = $this->customBuckets->getBucketData( 'page-id-to-confluence-title-map' );
@@ -643,13 +648,14 @@ private function buildPageMaps( DOMDocument $dom ): void {
 		if ( $spaceId === null ) {
 			return;
 		}
-		if ( !isset( $spaceIdToPrefixMap[$spaceId] ) ) {
+		if ( !isset( $spaceIdToSpaceKeyMap[$spaceId] ) ) {
 			return;
 		}
-		$prefix = $spaceIdToPrefixMap[$spaceId];
+		$spaceKey = $spaceIdToSpaceKeyMap[$spaceId];
+
 		if (
 			isset( $this->advancedConfig['analyzer-include-spacekey'] )
-			&& !in_array( strtolower( $prefix ), $this->advancedConfig['analyzer-include-spacekey'] )
+			&& !in_array( strtolower( $spaceKey ), $this->advancedConfig['analyzer-include-spacekey'] )
 		) {
 			return;
 		}
@@ -1078,7 +1084,6 @@ private function makeAttachmentReference( XMLHelper $xmlHelper, DOMElement $atta
 	}
 
 	private function checkTitles(): void {
-		$spacePrefixMap = $this->customBuckets->getBucketData( 'space-id-to-prefix-map' );
 		$pagesTitlesMap = $this->customBuckets->getBucketData( 'pages-titles-map' );
 
 		$hasInvalidTitles = false;
@@ -1115,7 +1120,7 @@ private function checkTitles(): void {
 					$hasInvalidNamespaces = true;
 				}
 
-				if ( mb_strlen( urlencode( $text ) ) > 255 ) {
+				if ( strlen( $text ) > 255 ) {
 					$this->customBuckets->addData(
 						'invalid-titles',
 						'length', $title,
@@ -1124,7 +1129,7 @@ private function checkTitles(): void {
 					$hasInvalidTitles = true;
 				}
 			} else {
-				if ( mb_strlen( urlencode( $title ) ) > 255 ) {
+				if ( strlen( $title ) > 255 ) {
 					$this->customBuckets->addData(
 						'invalid-titles',
 						'length', $title,

src/Converter/ConfluenceConverter.php

@@ -8,6 +8,7 @@
 use DOMXPath;
 use HalloWelt\MediaWiki\Lib\Migration\Converter\PandocHTML;
 use HalloWelt\MediaWiki\Lib\Migration\DataBuckets;
+use HalloWelt\MediaWiki\Lib\Migration\ExecutionTime;
 use HalloWelt\MediaWiki\Lib\Migration\IOutputAwareInterface;
 use HalloWelt\MediaWiki\Lib\Migration\Workspace;
 use HalloWelt\MigrateConfluence\Converter\Postprocessor\FixImagesWithExternalUrl;
@@ -134,7 +135,8 @@ public function __construct( $config, Workspace $workspace ) {
 
 		$this->customBuckets = new DataBuckets( [
 			'title-uploads',
-			'title-uploads-fail'
+			'title-uploads-fail',
+			'converter-body-content-id-execution-time',
 		] );
 	}
 
@@ -149,6 +151,7 @@ public function setOutput( Output $output ) {
 	 * @inheritDoc
 	 */
 	protected function doConvert( SplFileInfo $file ): string {
+		$executionTime = new ExecutionTime();
 		$this->output->writeln( $file->getPathname() );
 		$this->dataLookup = ConversionDataLookup::newFromBuckets( $this->dataBuckets );
 		$this->conversionDataWriter = ConversionDataWriter::newFromBuckets( $this->dataBuckets );
@@ -218,6 +221,15 @@ protected function doConvert( SplFileInfo $file ): string {
 		$this->postProcessLinks();
 		$this->postprocessWikiText();
 
+		$executionTimeString = $executionTime->getHumanReadableTime();
+		$this->customBuckets->addData(
+			'converter-body-content-id-execution-time',
+			$bodyContentId,
+			$executionTimeString,
+			false,
+			true
+		);
+
 		$this->customBuckets->saveToWorkspace( $this->workspace );
 
 		return $this->wikiText;
@@ -782,7 +794,11 @@ private function buildMediaExcludeList( $wikiText ): array {
 	 * @return string
 	 */
 	private function getCurrentPageTitle(): string {
+		$prefix = '';
 		$spaceIdPrefixMap = $this->dataBuckets->getBucketData( 'space-id-to-prefix-map' );
+		if ( !isset( $spaceIdPrefixMap[$this->currentSpace] ) ) {
+			$this->output->writeln( "SpaceId {$this->currentSpace} not found in spaceIdPrefixMap" );
+		}
 		$prefix = $spaceIdPrefixMap[$this->currentSpace];
 		$currentPageTitle = $this->currentPageTitle;