Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ustadmobile.zim2xapi

import com.ustadmobile.zim2xapi.utils.FileConstants
import org.jsoup.Jsoup
import java.io.File

Expand Down Expand Up @@ -27,7 +28,7 @@ class AddxAPIStatementUseCase {
// if doesn't exist, presume not a khan exercise
if (!perseusFile.exists()) return

val indexFile = File(zimFolder, "index.html")
val indexFile = File(zimFolder, FileConstants.INDEX_HTML_FILE)

val indexDoc = Jsoup.parse(indexFile)
val scoreScript = indexDoc.createElement("script")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/ustadmobile/zim2xapi/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class DownloadTopic : CliktCommand(name = "convert") {
ShrinkXapiUseCase().invoke(extractedZimFolder)

// create the xApi zip file
val xapiFile = CreateXapiFileUseCase(zimDumpProcess, AddxAPIStatementUseCase(), json).invoke(
val xapiFile = CreateXapiFileUseCase(zimDumpProcess, AddxAPIStatementUseCase(), CreateManifestFileUseCase(), json).invoke(
extractedZimFolder,
outputDir,
fileName,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.ustadmobile.zim2xapi

import com.ustadmobile.zim2xapi.utils.FileConstants
import org.jsoup.Jsoup
import java.io.File

class CreateManifestFileUseCase {

operator fun invoke(
zimFolder: File
): File {

val manifestFile = File(zimFolder, MANIFEST_FILE)

manifestFile.bufferedWriter().use { writer ->
zimFolder.walkTopDown().filter {
it.isFile
}.forEach { file ->
writer.write(file.relativeTo(zimFolder).path)
writer.newLine()
}
}

val indexHtmlFile = File(zimFolder, FileConstants.INDEX_HTML_FILE)
if (indexHtmlFile.exists()) {
val indexDoc = Jsoup.parse(indexHtmlFile)
val linkTag = indexDoc.createElement("link")
linkTag.attr("rel", "manifest")
linkTag.attr("href", MANIFEST_FILE)
indexDoc.head().appendChild(linkTag)
indexHtmlFile.writeText(indexDoc.html())
}


return manifestFile
}

companion object {

const val MANIFEST_FILE = "manifest.txt"

}


}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import java.util.zip.ZipOutputStream
class CreateXapiFileUseCase(
private val zimDumpProcess: ProcessBuilderUseCase,
private val addXApi: AddxAPIStatementUseCase,
private val createManifestFileUseCase: CreateManifestFileUseCase,
private val json: Json
) {

Expand Down Expand Up @@ -70,6 +71,7 @@ class CreateXapiFileUseCase(
)

addXApi.invoke(zimFolder, passingGrade)
createManifestFileUseCase.invoke(zimFolder)

val xapiFile = File(outputFolder, "$fileName.zip")
ZipOutputStream(FileOutputStream(xapiFile)).use { zipOut ->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package com.ustadmobile.zim2xapi

import org.jsoup.Jsoup
import org.junit.Before
import org.junit.Test
import java.io.File
import kotlin.io.path.createTempDirectory
import kotlin.test.assertTrue

class CreateManifestUseCaseTest {

private val createManifestUseCase = CreateManifestFileUseCase()

private lateinit var zimFolder: File

@Before
fun setup(){
zimFolder = createTemporaryFolder("zimFolder")
}


@Test
fun `test generate manifest`() {
val assetsFolder = File(zimFolder, "assets")
assetsFolder.mkdirs()

val videoFolder = File(assetsFolder, "video")
videoFolder.mkdirs()

File(assetsFolder, "script.js").writeText("console.log('Hello World')")
File(videoFolder, "style.css").writeText("body { color: red; }")

val indexHtmlFile = File(zimFolder, "index.html")
indexHtmlFile.writeText("""
<html lang="en">
<head>
<meta charset="UTF-8">
<title>My Web App</title>
</head>
<body>
<h1>Welcome to my Web App</h1>
</body>
</html>
""".trimIndent())


val manifestFile = createManifestUseCase(zimFolder)

assertTrue(manifestFile.exists())

val expectedPaths = listOf(
"assets/script.js",
"assets/video/style.css",
"index.html"
)

val actualLines = manifestFile.readLines()

assertTrue(actualLines.containsAll(expectedPaths))

val updatedDoc = Jsoup.parse(indexHtmlFile, "UTF-8")
val linkElement = updatedDoc.select("link[rel=manifest]").first()

assertTrue(linkElement != null, "Manifest link tag should exist")
assertTrue(linkElement.attr("href") == "manifest.txt", "Manifest link href should be manifest.txt")

}
private fun createTemporaryFolder(name: String): File {
return createTempDirectory(name).toFile()
}




}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ class CreateXapiFileUseCaseTest {

private val zimDumpProcess = mockk<ProcessBuilderUseCase>(relaxed = true)
private val xapiStatement = AddxAPIStatementUseCase()
private val createXapiFileUseCase = CreateXapiFileUseCase(zimDumpProcess, xapiStatement, Json)
private val createManifestFileUseCase = CreateManifestFileUseCase()
private val createXapiFileUseCase = CreateXapiFileUseCase(zimDumpProcess, xapiStatement, createManifestFileUseCase, Json)

@Test
fun `invoke should create tincan xml and zip file`() {
Expand Down