Merge branch 'main' into files-only

Reviewed-on: #2

README.md

@@ -21,6 +21,12 @@ go build -o canvasarchiver ./cmd/canvasarchiver
    ./canvasarchiver
    ```
 
+   Or 
+   ```bash
+   ./canvasarchiver -fo
+   ```
+   For files-only mode.
+
 2. On first run, you'll be prompted to authenticate:
    - Visit the provided OAuth URL
    - Authorize the application

cmd/canvasarchiver/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"net/http"
 	"os"
@@ -12,6 +13,9 @@ import (
 )
 
 func main() {
+	filesOnly := flag.Bool("fo", false, "Files only mode - download all files to a single directory without module structure")
+	flag.Parse()
+
 	httpClient := &http.Client{}
 
 	authenticator := auth.NewAuthenticator(httpClient)
@@ -25,7 +29,7 @@ func main() {
 	fmt.Print("Enter Course ID: ")
 	fmt.Scanln(&courseID)
 
-	canvasClient := canvas.NewClient(httpClient, accessToken, courseID)
+	canvasClient := canvas.NewClient(httpClient, accessToken, courseID, *filesOnly)
 
 	if err := canvasClient.GetCourseInfo(); err != nil {
 		fmt.Printf("Error: %v\n", err)
@@ -40,5 +44,7 @@ func main() {
 
 	canvasClient.DownloadModules(courseRoot)
 
+	if !*filesOnly {
 		panopto.DownloadMainRecordings(httpClient, accessToken, courseID, courseRoot)
 	}
+}

internal/canvas/client.go

@@ -21,13 +21,17 @@ type Client struct {
 	AccessToken     string
 	CourseID        string
 	CourseName      string
+	FilesOnly       bool
+	downloadedFiles map[string]bool
 }
 
-func NewClient(httpClient *http.Client, accessToken, courseID string) *Client {
+func NewClient(httpClient *http.Client, accessToken, courseID string, filesOnly bool) *Client {
 	return &Client{
 		HTTPClient:      httpClient,
 		AccessToken:     accessToken,
 		CourseID:        courseID,
+		FilesOnly:       filesOnly,
+		downloadedFiles: make(map[string]bool),
 	}
 }
 
@@ -80,10 +84,20 @@ func (c *Client) DownloadCourseFiles(root string) {
 	fileCount := 0
 	for _, file := range files {
 
+		if c.FilesOnly {
+			if c.downloadedFiles[file.DisplayName] {
+				continue
+			}
+			c.downloadedFiles[file.DisplayName] = true
+		}
+
 		rawFolderPath := folderMap[file.FolderID]
 		safeFolderPath := utils.SanitizePath(rawFolderPath)
 
-		subDir := filepath.Join(root, "Course Files", safeFolderPath)
+		subDir := root
+		if !c.FilesOnly {
+			subDir = filepath.Join(root, "Course Files", safeFolderPath)
+		}
 		os.MkdirAll(subDir, 0o755)
 		path := filepath.Join(subDir, utils.Sanitize(file.DisplayName))
 
@@ -125,9 +139,15 @@ func (c *Client) DownloadModules(courseRoot string) {
 	resp.Body.Close()
 
 	for _, mod := range modules {
-		modBaseDir := filepath.Join(courseRoot, "Modules", utils.Sanitize(mod.Name))
+		modBaseDir := courseRoot
+		if !c.FilesOnly {
+			modBaseDir = filepath.Join(courseRoot, "Modules", utils.Sanitize(mod.Name))
+		}
 		os.MkdirAll(modBaseDir, 0o755)
+
+		if !c.FilesOnly {
 			fmt.Printf("\n[Module] %s\n", mod.Name)
+		}
 
 		subHeaderStack := []string{}
 		lastIndent := 0
@@ -135,13 +155,16 @@ func (c *Client) DownloadModules(courseRoot string) {
 		for _, item := range mod.Items {
 
 			targetDir := modBaseDir
-			if len(subHeaderStack) > 0 {
+			if len(subHeaderStack) > 0 && !c.FilesOnly {
 				targetDir = filepath.Join(modBaseDir, filepath.Join(subHeaderStack...))
 			}
 			os.MkdirAll(targetDir, 0o755)
 
 			switch item.Type {
 			case "SubHeader":
+				if c.FilesOnly {
+					continue
+				}
 				currentIndent := item.Indent
 				if currentIndent <= lastIndent && len(subHeaderStack) > 0 {
 					levelsToKeep := currentIndent
@@ -162,11 +185,17 @@ func (c *Client) DownloadModules(courseRoot string) {
 				c.downloadModuleFile(item, targetDir)
 
 			case "ExternalTool":
+				if c.FilesOnly {
+					continue
+				}
 				indent := strings.Repeat("  ", len(subHeaderStack)+1)
 				fmt.Printf("%s- Found video tool: %s\n", indent, item.Title)
 				panopto.DownloadVideo(c.HTTPClient, c.AccessToken, c.CourseID, targetDir, item.URL, item.Title)
 
 			case "ExternalUrl":
+				if c.FilesOnly {
+					continue
+				}
 				if strings.Contains(item.ExternalURL, "panopto.eu") {
 					indent := strings.Repeat("  ", len(subHeaderStack)+1)
 					fmt.Printf("%s- Found direct video link: %s\n", indent, item.Title)
@@ -175,6 +204,9 @@ func (c *Client) DownloadModules(courseRoot string) {
 				}
 
 			case "Page":
+				if c.FilesOnly {
+					continue
+				}
 				c.searchPageForVideos(item, targetDir)
 			}
 		}
@@ -200,11 +232,18 @@ func (c *Client) downloadModuleFile(item models.ModuleItem, dir string) {
 		return
 	}
 
+	if c.FilesOnly {
+		if c.downloadedFiles[fileMeta.DisplayName] {
+			return
+		}
+		c.downloadedFiles[fileMeta.DisplayName] = true
+	}
+
 	ext := filepath.Ext(fileMeta.DisplayName)
 	origBase := strings.TrimSuffix(fileMeta.DisplayName, ext)
 
 	fileName := fileMeta.DisplayName
-	if !strings.EqualFold(origBase, item.Title) && item.Title != "" {
+	if !c.FilesOnly && !strings.EqualFold(origBase, item.Title) && item.Title != "" {
 		fileName = fmt.Sprintf("%s (%s)%s", origBase, item.Title, ext)
 	}