Skip to content

Fix AI Literacy Course lesson-item ordering #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hal-eisen-adfa merged 1 commit into from
Jul 1, 2026
+16 −9
Merged

Fix AI Literacy Course lesson-item ordering #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ai-literacy-course/src/main/kotlin/org/appdevforall/ailiteracycourse/CourseInstaller.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ object CourseInstaller {
// through this viewer (served same-origin from <root>/pdfjs/web/viewer.html).
private const val PDFJS_ASSET = "pdfjs.zip"

// Bumped to 2 to force existing installs to re-extract with the PDF viewer.
private const val INSTALL_VERSION = 2
// Bumped to 3 to force existing installs to re-extract and regenerate the
// navigation shell with the corrected lesson-item ordering.
private const val INSTALL_VERSION = 3
private const val MARKER = ".installed-v$INSTALL_VERSION"

private val installLock = Any()
Expand Down
20 changes: 13 additions & 7 deletions ai-literacy-course/src/main/kotlin/org/appdevforall/ailiteracycourse/CourseShell.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ object CourseShell {

private enum class Kind { VIDEO, ACTIVITY, PDF }

private data class Item(val title: String, val href: String, val kind: Kind)
private data class Item(val order: Int, val title: String, val href: String, val kind: Kind)

private fun itemsOf(root: File, section: File): List<Item> {
val entries = section.listFiles() ?: return emptyList()
return entries.mapNotNull { entry ->
when {
entry.isFile && entry.extension.equals("mp4", true) ->
Item(itemTitle(entry.nameWithoutExtension), rel(root, entry), Kind.VIDEO)
Item(leadingNumber(entry.nameWithoutExtension), itemTitle(entry.nameWithoutExtension), rel(root, entry), Kind.VIDEO)

entry.isFile && entry.extension.equals("pdf", true) ->
Item(itemTitle(entry.nameWithoutExtension), rel(root, entry), Kind.PDF)
Item(leadingNumber(entry.nameWithoutExtension), itemTitle(entry.nameWithoutExtension), rel(root, entry), Kind.PDF)

entry.isDirectory -> findIndexHtml(entry)?.let { index ->
Item(itemTitle(entry.name), rel(root, index), Kind.ACTIVITY)
Item(leadingNumber(entry.name), itemTitle(entry.name), rel(root, index), Kind.ACTIVITY)
}

else -> null
}
}.sortedWith(compareBy({ leadingNumber(it.title) }, { it.title }))
}.sortedWith(compareBy({ it.order }, { it.title }))
}

/** Shallowest index.html under [dir] (activities nest theirs differently). */
Expand Down Expand Up @@ -124,8 +124,14 @@ object CourseShell {
private fun itemTitle(raw: String): String =
titleCase(raw.replace(Regex("^\\d+-"), ""))

private fun leadingNumber(title: String): Int =
Regex("(\\d+)").find(title)?.groupValues?.get(1)?.toIntOrNull() ?: Int.MAX_VALUE
/**
* The leading "12-" ordering prefix of a raw file/dir name, as an int.
* Anchored to the start so a number later in the name (e.g. the "1" in
* "5-lesson-1-recap-quiz") can't be mistaken for the ordering key.
* Unnumbered entries sort last.
*/
private fun leadingNumber(rawName: String): Int =
Regex("^(\\d+)").find(rawName)?.groupValues?.get(1)?.toIntOrNull() ?: Int.MAX_VALUE

private fun titleCase(raw: String): String =
raw.split('-', ' ', '_').filter { it.isNotBlank() }.joinToString(" ") { w ->
Expand Down