Merge branch 'feature-sitetree-html-import' into release-0.2.0

pixl8 · Apr 8, 2024 · 06743c7 · 06743c7
2 parents e761ae8 + 748bf44
commit 06743c7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/services/HTMLImportService.cfc b/services/HTMLImportService.cfc
@@ -35,6 +35,7 @@ component {
 		var totalPages = 0;
 
 		arguments.logger?.info( "Importing HTML from ZIP..." );
+		arguments.progress?.setProgress( 10 );
 
 		try {
 			if ( !$helpers.isEmptyString( arguments.zipFilePath ) ) {
@@ -45,6 +46,7 @@ component {
 
 				if ( !$helpers.isEmptyString( htmlContent ) ) {
 					arguments.logger?.info( "Parsing HTML..." );
+					arguments.progress?.setProgress( 20 );
 
 					var html     = variables._jsoup.parse( htmlContent );
 					var elements = html.body().children();
@@ -109,6 +111,7 @@ component {
 		}
 
 		arguments.logger?.info( "Done." );
+		arguments.progress?.setProgress( 100 );
 
 		return parentPageId;
 	}
@@ -201,6 +204,8 @@ component {
 				}
 
 				arguments.pages[ i ].id = pageId;
+
+				arguments.progress?.setProgress( ( ( 70 / totalPages ) * i ) + 20 );
 			}
 		}