Added support for text-only exercises

internal/addresses.go

@@ -1,4 +1,21 @@
 package internal
 
+import (
+	"net/url"
+	"path"
+
+	"github.com/sirupsen/logrus"
+)
+
 const DefaultTrainingsServer = "academy-grpc.threedots.tech:443"
 const WebsiteAddress = "https://academy.threedots.tech/"
+
+func ExerciseURL(trainingName, exerciseID string) string {
+	exerciseURL, err := url.Parse(WebsiteAddress)
+	if err != nil {
+		logrus.WithError(err).Warn("Can't parse website URL")
+	}
+	exerciseURL.Path = path.Join("trainings/" + trainingName + "/exercise/" + exerciseID)
+
+	return exerciseURL.String()
+}

trainings/api/protobuf/server.proto

@@ -52,6 +52,8 @@ message NextExerciseResponse {
   string dir = 1;
   string exercise_id = 2;
   repeated File files_to_create = 3;
+
+  bool is_text_only = 5;
 }
 
 message NextExercise {

trainings/config/exercise.go

@@ -12,6 +12,7 @@ const exerciseConfigFile = ".tdl-exercise"
 type ExerciseConfig struct {
 	ExerciseID string `toml:"exercise_id"`
 	Directory  string `toml:"directory"`
+	IsTextOnly bool   `toml:"is_text_only"`
 }
 
 func (c Config) WriteExerciseConfig(trainingRootFs afero.Fs, cfg ExerciseConfig) error {

trainings/info.go

@@ -3,15 +3,11 @@ package trainings
 import (
 	"context"
 	"fmt"
-	"net/url"
-	"path"
-
-	"github.com/fatih/color"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 
 	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/ThreeDotsLabs/cli/trainings/config"
+	"github.com/fatih/color"
+	"github.com/pkg/errors"
 )
 
 func (h *Handlers) Info(ctx context.Context) error {
@@ -26,12 +22,6 @@ func (h *Handlers) Info(ctx context.Context) error {
 	trainingConfig := h.config.TrainingConfig(trainingRootFs)
 	exerciseConfig := h.config.ExerciseConfig(trainingRootFs)
 
-	exerciseURL, err := url.Parse(internal.WebsiteAddress)
-	if err != nil {
-		logrus.WithError(err).Warn("Can't parse website URL")
-	}
-	exerciseURL.Path = path.Join("trainings/" + trainingConfig.TrainingName + "/exercise/" + exerciseConfig.ExerciseID)
-
 	fmt.Println("### Training")
 	fmt.Println("Name:", color.CyanString(trainingConfig.TrainingName))
 	fmt.Println("Root dir:", color.CyanString(trainingRoot))
@@ -40,7 +30,9 @@ func (h *Handlers) Info(ctx context.Context) error {
 	fmt.Println("### Current exercise")
 	fmt.Println("ID:", color.CyanString(exerciseConfig.ExerciseID))
 	fmt.Println("Files:", color.CyanString(h.generateRunTerminalPath(trainingRootFs)))
-	fmt.Println("Content:", color.CyanString(exerciseURL.String()))
+
+	exerciseURL := internal.ExerciseURL(trainingConfig.TrainingName, exerciseConfig.ExerciseID)
+	fmt.Println("Content:", color.CyanString(exerciseURL))
 
 	return nil
 }

trainings/next.go

@@ -45,6 +45,13 @@ func (h *Handlers) nextExercise(ctx context.Context, currentExerciseID string) (
 		return false, err
 	}
 
+	if resp.IsTextOnly {
+		printTextOnlyExerciseInfo(
+			h.config.TrainingConfig(trainingRootFs).TrainingName,
+			resp.ExerciseId,
+		)
+	}
+
 	return false, nil
 }
 
@@ -87,6 +94,7 @@ func (h *Handlers) writeExerciseFiles(resp *genproto.NextExerciseResponse, train
 		config.ExerciseConfig{
 			ExerciseID: resp.ExerciseId,
 			Directory:  resp.Dir,
+			IsTextOnly: resp.IsTextOnly,
 		},
 	)
 }

trainings/print.go

@@ -25,3 +25,10 @@ func printFinished() {
 func printPaymentRequired() {
 	fmt.Println(color.GreenString("You finished the free part of the training. To continue, please go back to our website."))
 }
+
+func printTextOnlyExerciseInfo(trainingName, exerciseID string) {
+	fmt.Println(
+		color.GreenString("This lesson is text-only.\nYou can read it in your browser:"),
+		internal.ExerciseURL(trainingName, exerciseID)+"\n",
+	)
+}

trainings/run.go

@@ -130,6 +130,13 @@ func (h *Handlers) interactiveRun(ctx context.Context, trainingRootFs *afero.Bas
 			return nil
 		}
 
+		// this is refreshed config after nextExercise execution
+		currentExerciseConfig := h.config.ExerciseConfig(trainingRootFs)
+
+		if currentExerciseConfig.IsTextOnly {
+			continue
+		}
+
 		if !internal.ConfirmPromptDefaultYes("run your solution") {
 			return nil
 		}
@@ -166,7 +173,7 @@ func (h *Handlers) runExercise(ctx context.Context, trainingRootFs *afero.BasePa
 		return false, err
 	}
 
-	if len(solutionFiles) == 0 {
+	if len(solutionFiles) == 0 && !exerciseConfig.IsTextOnly {
 		solutionFilesRealPath, err := trainingRootFs.RealPath(exerciseConfig.Directory)
 		if err != nil {
 			logrus.WithField("exercise_dir", exerciseConfig.Directory).Warn("Can't get realpath of solution")
@@ -216,7 +223,9 @@ func (h *Handlers) runExercise(ctx context.Context, trainingRootFs *afero.BasePa
 
 			if response.Successful {
 				fmt.Println(color.GreenString("SUCCESS"))
-				fmt.Println("\nYou can now see an example solution on the website.")
+				if !exerciseConfig.IsTextOnly {
+					fmt.Println("\nYou can now see an example solution on the website.")
+				}
 				successful = true
 				finished = true
 			} else {