Merge pull request #40 from fwicht/download-enhancements

Download enhancements

Author: jrudio

cmd/commands.go

@@ -895,6 +895,10 @@ func downloadMedia(c *cli.Context) error {
 		downloadPath = "."
 	}
 
+	createFolders := c.Bool("folders")
+
+	skipIfExists := c.Bool("skip")
+
 	// search for media
 	results, err := plexConn.Search(c.Args().First())
 
@@ -927,7 +931,7 @@ func downloadMedia(c *cli.Context) error {
 	selectedMedia := results.MediaContainer.Metadata[selection]
 
 	// download media
-	if err := plexConn.Download(selectedMedia, downloadPath); err != nil {
+	if err := plexConn.Download(selectedMedia, downloadPath, createFolders, skipIfExists); err != nil {
 		return cli.NewExitError(err, 1)
 	}
 

cmd/main.go

@@ -153,6 +153,16 @@ func main() {
 			Name:   "download",
 			Usage:  "download media from your plex server",
 			Action: downloadMedia,
+			Flags: []cli.Flag{
+				cli.BoolFlag{
+					Name:  "folders",
+					Usage: "create folder hierarchy",
+				},
+				cli.BoolFlag{
+					Name:  "skip",
+					Usage: "skip download if file already exists",
+				},
+			},
 		},
 	}
 

plex.go

@@ -324,9 +324,24 @@ func (p *Plex) GetOnDeck() (SearchResultsEpisode, error) {
 }
 
 // Download media associated with metadata
-func (p *Plex) Download(meta Metadata, path string) error {
+func (p *Plex) Download(meta Metadata, path string, createFolders bool, skipIfExists bool) error {
+
+	if len(meta.Media) == 0 {
+		return fmt.Errorf("no media associated with metadata, skipping")
+	}
 
 	path = filepath.Join(path)
+	if createFolders {
+
+		if meta.ParentTitle != "" && meta.GrandparentTitle != "" { // for tv shows and music
+			path = filepath.Join(path, meta.GrandparentTitle, meta.ParentTitle)
+		} else { // for movies
+			path = filepath.Join(path, meta.Title)
+		}
+		if err := os.MkdirAll(path, 0700); err != nil {
+			return err
+		}
+	}
 
 	for _, media := range meta.Media {
 
@@ -335,9 +350,14 @@ func (p *Plex) Download(meta Metadata, path string) error {
 			// get original filename from original path
 			split := strings.Split(part.File, "/")
 			file := split[len(split)-1]
-			// compute filepath
-			fp := fmt.Sprintf("%s/%s", path, file)
-			fp = filepath.Join(fp)
+
+			fp := filepath.Join(path, file)
+
+			_, exists := os.Stat(fp)
+
+			if exists == nil && skipIfExists {
+				return nil
+			}
 
 			query := fmt.Sprintf("%s%s?download=1", p.URL, part.Key)