fix resources path

pillar-markup · May 15, 2024 · 625a2e3 · 625a2e3
1 parent 5051687
commit 625a2e3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/Microdown-Agenda-Tests/MicAgendaGeneratorTest.class.st b/src/Microdown-Agenda-Tests/MicAgendaGeneratorTest.class.st
@@ -187,6 +187,7 @@ MicAgendaGeneratorTest >> testAgendaHtmlIsGeneratedInRightDirectoryWhenAbsoluteF
 
 	self assert: generator resourcesOutputDir equals: FileLocator workingDirectory / 'generated' / 'resources'.
 	self assert: generator outputFile equals: FileLocator root / 'foo' / 'bar' / 'agenda.html'.
+	self assert: generator generatedResourcesPath equals: './resources'
 ]
 
 { #category : #tests }
@@ -199,6 +200,7 @@ MicAgendaGeneratorTest >> testAgendaHtmlIsGeneratedInRightDirectoryWhenRelativeF
 
 	self assert: generator resourcesOutputDir equals: FileLocator workingDirectory / 'generated' / 'resources'.
 	self assert: generator outputFile equals: FileLocator workingDirectory / 'generated' / 'foo' / 'bar' / 'agenda.html'.
+	self assert: generator generatedResourcesPath equals: '../../resources'
 ]
 
 { #category : #tests }

diff --git a/src/Microdown-Agenda/MicAgendaGenerator.class.st b/src/Microdown-Agenda/MicAgendaGenerator.class.st
@@ -116,7 +116,7 @@ MicAgendaGenerator >> dayTalksTemplate [
 	^ self templatesDir / 'dayTalks.mustache'
 ]
 
-{ #category : #building }
+{ #category : #private }
 MicAgendaGenerator >> ensureOutputFileParentCreated: aFileReference [
 
 	self outputDir ensureCreateDirectory.
@@ -126,6 +126,22 @@ MicAgendaGenerator >> ensureOutputFileParentCreated: aFileReference [
 	aFileReference parent ensureCreateDirectory
 ]
 
+{ #category : #accessing }
+MicAgendaGenerator >> generatedResourcesPath [
+
+	| nbNestedFolders resourcesPathString |
+
+	self outputFile isAbsolute ifTrue: [ ^ './resources' ].
+
+	nbNestedFolders := (self outputFile relativeTo: self outputDir) segments size - 1.
+	resourcesPathString := ''.
+	nbNestedFolders timesRepeat: [ resourcesPathString := '../' , resourcesPathString ].
+	^ resourcesPathString
+		ifEmpty: [ './resources' ]
+		ifNotEmpty: [ resourcesPathString , 'resources' ]
+
+]
+
 { #category : #private }
 MicAgendaGenerator >> gitRepositoryDir [
 
@@ -230,7 +246,8 @@ MicAgendaGenerator >> visitAgenda: anAgenda [
 						 ('HAS_ABSTRACT' -> self abstractLink notNil).
 						 ('ABSTRACT_LINK' -> self abstractLink).
 			          ('DAYS_HEADER_BLOCK_HTML' -> daysHeaderBlockHtml).
-			          ('DAYS_HTML' -> daysHtml) } asDictionary.
+			          ('DAYS_HTML' -> daysHtml).
+						 ('RESOURCES_PATH' -> self generatedResourcesPath) } asDictionary.
 	canvas nextPutAll: agenda
 ]