Remove course ID from slug and assume default course

Fixes #1288

Author: Razoric480

autoload/NavigationManager.gd

@@ -22,7 +22,7 @@ var _url_normalization_regex := RegExpGroup.compile(
 	r"^(?<prefix>user:\/\/|res:\/\/|\.*?\/+)(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<lesson_file>[^\.]+\.[^\/]+)?\/?(?<practice>.*)?",
 )
 var _slug_normalization_regex := RegExpGroup.compile(
-	r"^(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<practice>.*)?",
+	r"^(?<lesson>[^\/]+)\/?(?<practice>.*)?",
 )
 var _lesson_cache := { }
 
@@ -136,12 +136,12 @@ func navigate_to_welcome_screen() -> void:
 	welcome_screen_navigation_requested.emit()
 
 
-func navigate_to_lesson(course_id: String, lesson_slug: String) -> void:
-	navigate_to("%s/%s" % [course_id, lesson_slug])
+func navigate_to_lesson(lesson_slug: String) -> void:
+	navigate_to("%s" % [lesson_slug])
 
 
-func navigate_to_practice(course_id: String, lesson_slug: String, practice_id: String) -> void:
-	navigate_to("%s/%s/%s" % [course_id, lesson_slug, practice_id])
+func navigate_to_practice(lesson_slug: String, practice_id: String) -> void:
+	navigate_to("%s/%s" % [lesson_slug, practice_id])
 
 
 func navigate_to(metadata: String) -> void:
@@ -155,16 +155,13 @@ func navigate_to(metadata: String) -> void:
 
 	var normalized := NormalizedUrl.new(regex_result)
 
-	var course_index := CourseIndexPaths.get_course_index_instance(normalized.course_path)
-	if not course_index:
-		push_error("'%s' is not a valid course" % [normalized.course_path])
-		return
+	var course_index := CourseIndexPaths.get_course_index_instance(CourseIndexPaths.DEFAULT_COURSE_INDEX)
 
 	# legacy slugs support
 	var legacy_path := normalized.lesson_path
 	var lesson_slug := course_index.get_real_slug_from_slug(legacy_path)
 	if lesson_slug != legacy_path:
-		regex_result = _slug_normalization_regex.search("%s/%s" % [course_index.get_course_id(), lesson_slug])
+		regex_result = _slug_normalization_regex.search("%s" % [lesson_slug])
 		normalized = NormalizedUrl.new(regex_result)
 
 	var lesson_path := course_index.get_lesson_path_from_slug(normalized.lesson_path)
@@ -174,7 +171,7 @@ func navigate_to(metadata: String) -> void:
 		push_error("`%s` is not a lesson" % lesson_path)
 		return
 
-	var effective_path := "%s/%s" % [course_index.get_course_id(), normalized.lesson_path]
+	var effective_path := "%s" % [normalized.lesson_path]
 	if normalized.practice_path != "":
 		var practice := course_index.get_practice_from_slug("%s/%s" % [normalized.lesson_path, normalized.practice_path])
 		if not practice is BBCodeParser.ParseNode:
@@ -195,12 +192,13 @@ func get_navigation_resource(resource_id: String) -> BBCodeParser.ParseNode:
 		is_slug = true
 		normalized_url_groups = _slug_normalization_regex.search(resource_id)
 	var is_practice := not normalized_url_groups.get_string("practice").is_empty()
+	
+	var course_index := CourseIndexPaths.get_course_index_instance(CourseIndexPaths.DEFAULT_COURSE_INDEX)
 
 	var bbcode_path := resource_id
 	if is_practice:
 		bbcode_path = bbcode_path.left(-(normalized_url_groups.get_end("practice")-normalized_url_groups.get_start("practice")+1))
 	if is_slug:
-		var course_index := CourseIndexPaths.get_course_index_instance(normalized_url_groups.get_string("course"))
 		bbcode_path = course_index.get_lesson_path_from_slug(normalized_url_groups.get_string("lesson").trim_suffix("/"))
 
 	var lesson_data: BBCodeParser.ParseNode = null
@@ -227,7 +225,6 @@ func get_navigation_resource(resource_id: String) -> BBCodeParser.ParseNode:
 		_lesson_cache[bbcode_path] = lesson_data
 
 	if is_practice:
-		var course_index := CourseIndexPaths.get_course_index_instance(normalized_url_groups.get_string("course"))
 		var lesson_slug := course_index.get_lesson_slug_from_path(bbcode_path)
 		return course_index.get_practice_from_slug("%s/%s" % [lesson_slug, normalized_url_groups.get_string("practice")])
 	return lesson_data
@@ -354,15 +351,13 @@ func _push_javascript_state(url: String) -> void:
 
 class NormalizedUrl:
 	var protocol := ""
-	var course_path := ""
 	var lesson_path := ""
 	var practice_path := ""
 	var lesson_file := ""
 
 
 	func _init(regex_result: RegExMatch) -> void:
 		protocol = regex_result.get_string("prefix")
-		course_path = regex_result.get_string("course")
 		lesson_path = regex_result.get_string("lesson").trim_suffix("/")
 		practice_path = regex_result.get_string("practice")
 		lesson_file = regex_result.get_string("lesson_file")
@@ -371,26 +366,8 @@ class NormalizedUrl:
 			protocol = "res://"
 
 
-	func get_file_path(with_practices: bool = false) -> String:
-		var file_path := "%s%s/%s" % [protocol, course_path, lesson_path]
-		if lesson_file != "":
-			file_path += "/%s" % [lesson_file]
-		if with_practices and practice_path != "":
-			file_path += "/%s" % [practice_path]
-		return file_path
-
-
-	func get_web_url() -> String:
-		var url := "%s/%s" % [course_path, lesson_path]
-		if lesson_file != "":
-			url += "/%s" % [lesson_file]
-		if practice_path != "":
-			url += "/%s" % [practice_path]
-		return url
-
-
 	func _to_string() -> String:
-		var string := "%s%s/%s" % [protocol, course_path, lesson_path]
+		var string := "%s%s/%s" % [protocol, CourseIndexPaths.DEFAULT_COURSE_INDEX, lesson_path]
 		if lesson_file != "":
 			string += "/%s" % [lesson_file]
 		if practice_path != "":

ui/UINavigator.gd

@@ -71,7 +71,6 @@ func _ready() -> void:
 			if _lesson_index < 0 or _lesson_index >= course_index.get_lessons_count():
 				_lesson_index = 0
 			NavigationManager.navigate_to_lesson(
-				course_index.get_course_id(),
 				course_index.get_lesson_slug(_lesson_index),
 			)
 	else:
@@ -243,7 +242,6 @@ func _on_practice_next_requested(practice: BBCodeParser.ParseNode) -> void:
 		var next_practice := BBCodeUtils.get_lesson_practice(lesson_data, index + 1)
 		var next_practice_id := BBCodeUtils.get_practice_id(next_practice)
 		NavigationManager.navigate_to_practice(
-			course_index.get_course_id(),
 			course_index.get_lesson_slug(_lesson_index),
 			next_practice_id,
 		)
@@ -273,15 +271,13 @@ func _on_practice_previous_requested(practice: BBCodeParser.ParseNode) -> void:
 		var previous_practice_id := BBCodeUtils.get_practice_id(previous_practice)
 		# Otherwise, go to the previous practice in the set.
 		NavigationManager.navigate_to_practice(
-			course_index.get_course_id(),
 			course_index.get_lesson_slug(_lesson_index),
 			previous_practice_id,
 		)
 
 
 func _on_practice_requested(practice: BBCodeParser.ParseNode) -> void:
 	NavigationManager.navigate_to_practice(
-		course_index.get_course_id(),
 		course_index.get_lesson_slug(_lesson_index),
 		BBCodeUtils.get_practice_id(practice),
 	)
@@ -298,7 +294,6 @@ func _on_lesson_completed() -> void:
 
 	_clear_history_stack()
 	NavigationManager.navigate_to_lesson(
-		course_index.get_course_id(),
 		course_index.get_lesson_slug(_lesson_index),
 	)
 

ui/components/BreadCrumbs.gd

@@ -116,7 +116,7 @@ func _create_navigation_node(text: String, course_index: CourseIndex, path: Stri
 		navigation_node.add_theme_font_size_override("font_size", NODE_FONT_SIZE)
 		navigation_node.mouse_default_cursor_shape = CURSOR_POINTING_HAND
 		add_child(navigation_node)
-		var slug := "%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(path)]
+		var slug := "%s" % [course_index.get_lesson_slug_from_path(path)]
 		navigation_node.pressed.connect(_on_navigation_pressed.bind(slug))
 
 

ui/screens/course_outliner/CourseLessonDetails.gd

@@ -93,4 +93,4 @@ func _on_goto_lesson_pressed() -> void:
 	if not lesson:
 		return
 
-	NavigationManager.navigate_to("%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(lesson.bbcode_path)])
+	NavigationManager.navigate_to("%s" % [course_index.get_lesson_slug_from_path(lesson.bbcode_path)])