Remove $ from practice slugs

Author: Razoric480

autoload/NavigationManager.gd

@@ -19,10 +19,10 @@ var arguments := { }
 
 var _current_unload_type := -1
 var _url_normalization_regex := RegExpGroup.compile(
-	r"^(?<prefix>user:\/\/|res:\/\/|\.*?\/+)#?(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<lesson_file>[^\.]+\.[^\/]+)?\/?(?<practice>\$.*)?",
+	r"^(?<prefix>user:\/\/|res:\/\/|\.*?\/+)#?(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<lesson_file>[^\.]+\.[^\/]+)?\/?(?<practice>.*)?",
 )
 var _slug_normalization_regex := RegExpGroup.compile(
-	r"^#?(?<course>[^\/]+)\/(?<lesson>[^\$]+)\/?(?<practice>\$.*)?",
+	r"^#?(?<course>[^\/]+)\/(?<lesson>[^\/]+)\/?(?<practice>.*)?",
 )
 var _lesson_cache := { }
 
@@ -141,7 +141,7 @@ func navigate_to_lesson(course_id: String, lesson_slug: String) -> void:
 
 
 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])
+	navigate_to("#%s/%s/%s" % [course_id, lesson_slug, practice_id])
 
 
 func navigate_to(metadata: String) -> void:
@@ -176,11 +176,11 @@ func navigate_to(metadata: String) -> void:
 
 	var effective_path := "%s/%s" % [course_index.get_course_id(), normalized.lesson_path]
 	if normalized.practice_path != "":
-		var practice := course_index.get_practice_from_slug("%s/$%s" % [normalized.lesson_path, 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:
 			push_error("'%s' does not have a practice at slug '%s'" % [lesson_path, normalized.practice_path])
 			return
-		effective_path += "/$%s" % [normalized.practice_path]
+		effective_path += "/%s" % [normalized.practice_path]
 
 	history.push_back(effective_path)
 	_push_javascript_state(effective_path)
@@ -364,7 +364,7 @@ class NormalizedUrl:
 		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").substr(1)
+		practice_path = regex_result.get_string("practice")
 		lesson_file = regex_result.get_string("lesson_file")
 
 		if protocol in ["//", "/"]:
@@ -376,7 +376,7 @@ class NormalizedUrl:
 		if lesson_file != "":
 			file_path += "/%s" % [lesson_file]
 		if with_practices and practice_path != "":
-			file_path += "/$%s" % [practice_path]
+			file_path += "/%s" % [practice_path]
 		return file_path
 
 
@@ -385,7 +385,7 @@ class NormalizedUrl:
 		if lesson_file != "":
 			url += "/%s" % [lesson_file]
 		if practice_path != "":
-			url += "/$%s" % [practice_path]
+			url += "/%s" % [practice_path]
 		return url
 
 
@@ -394,5 +394,5 @@ class NormalizedUrl:
 		if lesson_file != "":
 			string += "/%s" % [lesson_file]
 		if practice_path != "":
-			string += "/$%s" % [practice_path]
+			string += "/%s" % [practice_path]
 		return string

course/CourseLearnGDScriptIndex.gd

@@ -63,84 +63,84 @@ const _LESSON_SLUG_ALIASES := {
 	"lesson-28-specifying-types/lesson.tres": "specifying-types",
 
 	# legacy practices
-	"lesson-1-what-code-is-like/practice-55916.tres": "what-code-is-like/$try-your-first-code",
-	"lesson-2-your-first-error/practice-85733.tres": "your-first-error/$fix-your-first-error",
+	"lesson-1-what-code-is-like/practice-55916.tres": "what-code-is-like/try-your-first-code",
+	"lesson-2-your-first-error/practice-85733.tres": "your-first-error/fix-your-first-error",
 
-	"lesson-3-standing-on-shoulders-of-giants/practice-QiGjB7tK.tres": "standing-on-shoulders-of-giants/$make-the-character-visible",
-	"lesson-3-standing-on-shoulders-of-giants/practice-HJMQ2XNw.tres": "standing-on-shoulders-of-giants/$make-the-robot-upright",
+	"lesson-3-standing-on-shoulders-of-giants/practice-QiGjB7tK.tres": "standing-on-shoulders-of-giants/make-the-character-visible",
+	"lesson-3-standing-on-shoulders-of-giants/practice-HJMQ2XNw.tres": "standing-on-shoulders-of-giants/make-the-robot-upright",
 
-	"lesson-4-drawing-a-rectangle/practice-Gx0c7DDi.tres": "drawing-a-rectangle/$drawing-a-corner",
-	"lesson-4-drawing-a-rectangle/practice-5AJTESv5.tres": "drawing-a-rectangle/$drawing-a-rectangle",
-	"lesson-4-drawing-a-rectangle/practice-kGx0c7DD.tres": "drawing-a-rectangle/$drawing-a-bigger-rectangle",
+	"lesson-4-drawing-a-rectangle/practice-Gx0c7DDi.tres": "drawing-a-rectangle/drawing-a-corner",
+	"lesson-4-drawing-a-rectangle/practice-5AJTESv5.tres": "drawing-a-rectangle/drawing-a-rectangle",
+	"lesson-4-drawing-a-rectangle/practice-kGx0c7DD.tres": "drawing-a-rectangle/drawing-a-bigger-rectangle",
 
-	"lesson-5-your-first-function/practice-QiGjB7tK.tres": "your-first-function/$a-function-to-draw-squares",
-	"lesson-5-your-first-function/practice-kGx0c7DD.tres": "your-first-function/$drawing-multiple-squares",
+	"lesson-5-your-first-function/practice-QiGjB7tK.tres": "your-first-function/a-function-to-draw-squares",
+	"lesson-5-your-first-function/practice-kGx0c7DD.tres": "your-first-function/drawing-multiple-squares",
 
-	"lesson-6-multiple-function-parameters/practice-qAYVjotx.tres": "multiple-function-parameters/$drawing-corners-of-different-sizes",
-	"lesson-6-multiple-function-parameters/practice-DwfyqdYO.tres": "multiple-function-parameters/$using-multiple-parameters",
-	"lesson-6-multiple-function-parameters/practice-v5tT6n1T.tres": "multiple-function-parameters/$drawing-squares-of-any-size",
-	"lesson-6-multiple-function-parameters/practice-lkGx0c7D.tres": "multiple-function-parameters/$drawing-rectangles-of-any-size",
+	"lesson-6-multiple-function-parameters/practice-qAYVjotx.tres": "multiple-function-parameters/drawing-corners-of-different-sizes",
+	"lesson-6-multiple-function-parameters/practice-DwfyqdYO.tres": "multiple-function-parameters/using-multiple-parameters",
+	"lesson-6-multiple-function-parameters/practice-v5tT6n1T.tres": "multiple-function-parameters/drawing-squares-of-any-size",
+	"lesson-6-multiple-function-parameters/practice-lkGx0c7D.tres": "multiple-function-parameters/drawing-rectangles-of-any-size",
 
-	"lesson-7-member-variables/practice-Gx0c7DDi.tres": "member-variables/$draw-a-rectangle-at-a-precise-position",
-	"lesson-7-member-variables/practice-x0c7DDiz.tres": "member-variables/$draw-squares-at-different-positions",
+	"lesson-7-member-variables/practice-Gx0c7DDi.tres": "member-variables/draw-a-rectangle-at-a-precise-position",
+	"lesson-7-member-variables/practice-x0c7DDiz.tres": "member-variables/draw-squares-at-different-positions",
 
-	"lesson-8-defining-variables/practice-lkGx0c7D.tres": "defining-variables/$define-a-health-variable",
+	"lesson-8-defining-variables/practice-lkGx0c7D.tres": "defining-variables/define-a-health-variable",
 
-	"lesson-9-adding-and-subtracting/practice-nk1K416Q.tres": "adding-and-subtracting/$damaging-the-robot",
-	"lesson-9-adding-and-subtracting/practice-kGx0c7DD.tres": "adding-and-subtracting/$healing-the-robot",
+	"lesson-9-adding-and-subtracting/practice-nk1K416Q.tres": "adding-and-subtracting/damaging-the-robot",
+	"lesson-9-adding-and-subtracting/practice-kGx0c7DD.tres": "adding-and-subtracting/healing-the-robot",
 
-	"lesson-10-the-game-loop/practice-tKRHJMQ2.tres": "the-game-loop/$rotating-a-character-continuously",
-	"lesson-10-the-game-loop/practice-QiGjB7tK.tres": "the-game-loop/$creating-circular-movement",
+	"lesson-10-the-game-loop/practice-tKRHJMQ2.tres": "the-game-loop/rotating-a-character-continuously",
+	"lesson-10-the-game-loop/practice-QiGjB7tK.tres": "the-game-loop/creating-circular-movement",
 
-	"lesson-11-time-delta/practice-UdOCQiGj.tres": "time-delta/$rotating-using-delta",
-	"lesson-11-time-delta/practice-x0c7DDiz.tres": "time-delta/$moving-in-a-circle-using-delta",
+	"lesson-11-time-delta/practice-UdOCQiGj.tres": "time-delta/rotating-using-delta",
+	"lesson-11-time-delta/practice-x0c7DDiz.tres": "time-delta/moving-in-a-circle-using-delta",
 
-	"lesson-12-using-variables/practice-lkGx0c7D.tres": "using-variables/$clarifying-code-using-variables",
-	"lesson-12-using-variables/practice-KUdOCQiG.tres": "using-variables/$fixing-an-out-of-scope-error",
+	"lesson-12-using-variables/practice-lkGx0c7D.tres": "using-variables/clarifying-code-using-variables",
+	"lesson-12-using-variables/practice-KUdOCQiG.tres": "using-variables/fixing-an-out-of-scope-error",
 
-	"lesson-13-conditions/practice-KRHJMQ2X.tres": "conditions/$using-comparisons",
-	"lesson-13-conditions/practice-MqAYVjot.tres": "conditions/$limiting-healing",
-	"lesson-13-conditions/practice-xZPxY8VU.tres": "conditions/$preventing-health-from-going-below-zero",
+	"lesson-13-conditions/practice-KRHJMQ2X.tres": "conditions/using-comparisons",
+	"lesson-13-conditions/practice-MqAYVjot.tres": "conditions/limiting-healing",
+	"lesson-13-conditions/practice-xZPxY8VU.tres": "conditions/preventing-health-from-going-below-zero",
 
-	"lesson-14-multiplying/practice-0c7DDizK.tres": "multiplying/$increasing-maximum-health-exponentially",
-	"lesson-14-multiplying/practice-CQiGjB7t.tres": "multiplying/$reducing-damage-at-higher-levels",
+	"lesson-14-multiplying/practice-0c7DDizK.tres": "multiplying/increasing-maximum-health-exponentially",
+	"lesson-14-multiplying/practice-CQiGjB7t.tres": "multiplying/reducing-damage-at-higher-levels",
 
-	"lesson-16-2d-vectors/practice-RHJMQ2XN.tres": "2d-vectors/$increasing-scale-using-vectors",
-	"lesson-16-2d-vectors/practice-kGx0c7DD.tres": "2d-vectors/$resetting-size-and-position-using-vectors",
+	"lesson-16-2d-vectors/practice-RHJMQ2XN.tres": "2d-vectors/increasing-scale-using-vectors",
+	"lesson-16-2d-vectors/practice-kGx0c7DD.tres": "2d-vectors/resetting-size-and-position-using-vectors",
 
-	"lesson-17-while-loops/practice-lkGx0c7D.tres": "while-loops/$moving-to-the-end-of-a-board",
+	"lesson-17-while-loops/practice-lkGx0c7D.tres": "while-loops/moving-to-the-end-of-a-board",
 
-	"lesson-18-for-loops/practice-7tKRHJMQ.tres": "for-loops/$using-a-for-loop-to-move-to-the-end-of-the-board",
-	"lesson-18-for-loops/practice-UDpPwQDw.tres": "for-loops/$improving-code-with-a-for-loop",
+	"lesson-18-for-loops/practice-7tKRHJMQ.tres": "for-loops/using-a-for-loop-to-move-to-the-end-of-the-board",
+	"lesson-18-for-loops/practice-UDpPwQDw.tres": "for-loops/improving-code-with-a-for-loop",
 
-	"lesson-19-creating-arrays/practice-otxF5HUx.tres": "creating-arrays/$walking-to-the-robot",
-	"lesson-19-creating-arrays/practice-PxY8VUDp.tres": "creating-arrays/$selecting-units",
+	"lesson-19-creating-arrays/practice-otxF5HUx.tres": "creating-arrays/walking-to-the-robot",
+	"lesson-19-creating-arrays/practice-PxY8VUDp.tres": "creating-arrays/selecting-units",
 
-	"lesson-20-looping-over-arrays/practice-f8B67UJ8.tres": "looping-over-arrays/$move-the-robot-along-the-path",
-	"lesson-20-looping-over-arrays/practice-clsFcSrG.tres": "looping-over-arrays/$back-to-the-drawing-board",
+	"lesson-20-looping-over-arrays/practice-f8B67UJ8.tres": "looping-over-arrays/move-the-robot-along-the-path",
+	"lesson-20-looping-over-arrays/practice-clsFcSrG.tres": "looping-over-arrays/back-to-the-drawing-board",
 
-	"lesson-21-strings/practice-iGjB7tKR.tres": "strings/$creating-string-variables",
-	"lesson-21-strings/practice-NwQMqAYV.tres": "strings/$using-an-array-of-strings-to-play-a-combo",
+	"lesson-21-strings/practice-iGjB7tKR.tres": "strings/creating-string-variables",
+	"lesson-21-strings/practice-NwQMqAYV.tres": "strings/using-an-array-of-strings-to-play-a-combo",
 
-	"lesson-22-functions-return-values/practice-llf8B67U.tres": "functions-return-values/$converting-coordinates-from-the-grid-to-the-screen",
+	"lesson-22-functions-return-values/practice-llf8B67U.tres": "functions-return-values/converting-coordinates-from-the-grid-to-the-screen",
 
-	"lesson-23-append-to-arrays/practice-KUdOCQiG.tres": "append-to-arrays/$completing-orders",
-	"lesson-23-append-to-arrays/practice-B7tKRHJM.tres": "append-to-arrays/$clearing-up-the-crates",
+	"lesson-23-append-to-arrays/practice-KUdOCQiG.tres": "append-to-arrays/completing-orders",
+	"lesson-23-append-to-arrays/practice-B7tKRHJM.tres": "append-to-arrays/clearing-up-the-crates",
 
-	"lesson-24-access-array-indices/practice-ErO9L4MW.tres": "access-array-indices/$using-the-right-items",
-	"lesson-24-access-array-indices/practice-wfi7YGry.tres": "access-array-indices/$realigning-the-train-tracks",
+	"lesson-24-access-array-indices/practice-ErO9L4MW.tres": "access-array-indices/using-the-right-items",
+	"lesson-24-access-array-indices/practice-wfi7YGry.tres": "access-array-indices/realigning-the-train-tracks",
 
-	"lesson-25-creating-dictionaries/practice-tZixQOPR.tres": "creating-dictionaries/$creating-an-inventory-using-a-dictionary",
-	"lesson-25-creating-dictionaries/practice-9clsFcSr.tres": "creating-dictionaries/$increasing-item-counts",
+	"lesson-25-creating-dictionaries/practice-tZixQOPR.tres": "creating-dictionaries/creating-an-inventory-using-a-dictionary",
+	"lesson-25-creating-dictionaries/practice-9clsFcSr.tres": "creating-dictionaries/increasing-item-counts",
 
-	"lesson-26-looping-over-dictionaries/practice-nVHARbBW.tres": "looping-over-dictionaries/$displaying-the-inventory",
-	"lesson-26-looping-over-dictionaries/practice-bDGt6fUq.tres": "looping-over-dictionaries/$placing-units-on-the-board",
+	"lesson-26-looping-over-dictionaries/practice-nVHARbBW.tres": "looping-over-dictionaries/displaying-the-inventory",
+	"lesson-26-looping-over-dictionaries/practice-bDGt6fUq.tres": "looping-over-dictionaries/placing-units-on-the-board",
 
-	"lesson-27-value-types/practice-lkGx0c7D.tres": "value-types/$displaying-the-player-health-and-energy",
-	"lesson-27-value-types/practice-izKUdOCQ.tres": "value-types/$letting-the-player-type-numbers",
+	"lesson-27-value-types/practice-lkGx0c7D.tres": "value-types/displaying-the-player-health-and-energy",
+	"lesson-27-value-types/practice-izKUdOCQ.tres": "value-types/letting-the-player-type-numbers",
 
-	"lesson-28-specifying-types/practice-x0c7DDiz.tres": "specifying-types/$add-the-correct-type-hints-to-variables",
-	"lesson-28-specifying-types/practice-UdOCQiGj.tres": "specifying-types/$fix-the-values-to-match-the-type-hints",
+	"lesson-28-specifying-types/practice-x0c7DDiz.tres": "specifying-types/add-the-correct-type-hints-to-variables",
+	"lesson-28-specifying-types/practice-UdOCQiGj.tres": "specifying-types/fix-the-values-to-match-the-type-hints",
 }
 
 var _inverted_lessons := {}
@@ -203,4 +203,4 @@ func get_practice_from_slug(slug: String) -> BBCodeParser.ParseNode:
 
 
 func set_practice_slug(lesson_slug: String, practice_slug: String, practice: BBCodeParser.ParseNode) -> void:
-	practice_slugs["%s/$%s" % [lesson_slug, practice_slug]] = practice
+	practice_slugs["%s/%s" % [lesson_slug, practice_slug]] = practice