mirror of
https://github.com/zhaarey/apple-music-downloader.git
synced 2025-10-23 15:11:05 +00:00
Merge pull request #72 from rahulhingve/main
Add Separate Folder Support for AAC Downloads
This commit is contained in:
@@ -13,6 +13,7 @@ cover-size: 5000x5000
|
|||||||
cover-format: jpg #jpg png or original
|
cover-format: jpg #jpg png or original
|
||||||
alac-save-folder: AM-DL downloads
|
alac-save-folder: AM-DL downloads
|
||||||
atmos-save-folder: AM-DL-Atmos downloads
|
atmos-save-folder: AM-DL-Atmos downloads
|
||||||
|
aac-save-folder: AM-DL-AAC downloads
|
||||||
max-memory-limit: 256 # MB
|
max-memory-limit: 256 # MB
|
||||||
decrypt-m3u8-port: "127.0.0.1:10020"
|
decrypt-m3u8-port: "127.0.0.1:10020"
|
||||||
get-m3u8-port: "127.0.0.1:20020"
|
get-m3u8-port: "127.0.0.1:20020"
|
||||||
|
|||||||
11
main.go
11
main.go
@@ -645,6 +645,9 @@ func ripStation(albumId string, token string, storefront string, mediaUserToken
|
|||||||
if dl_atmos {
|
if dl_atmos {
|
||||||
singerFolder = filepath.Join(Config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
singerFolder = filepath.Join(Config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
||||||
}
|
}
|
||||||
|
if dl_aac {
|
||||||
|
singerFolder = filepath.Join(Config.AacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
||||||
|
}
|
||||||
os.MkdirAll(singerFolder, os.ModePerm) // Create artist folder
|
os.MkdirAll(singerFolder, os.ModePerm) // Create artist folder
|
||||||
station.SaveDir = singerFolder
|
station.SaveDir = singerFolder
|
||||||
|
|
||||||
@@ -898,6 +901,9 @@ func ripAlbum(albumId string, token string, storefront string, mediaUserToken st
|
|||||||
if dl_atmos {
|
if dl_atmos {
|
||||||
singerFolder = filepath.Join(Config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
singerFolder = filepath.Join(Config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
||||||
}
|
}
|
||||||
|
if dl_aac {
|
||||||
|
singerFolder = filepath.Join(Config.AacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
||||||
|
}
|
||||||
os.MkdirAll(singerFolder, os.ModePerm) // Create artist folder
|
os.MkdirAll(singerFolder, os.ModePerm) // Create artist folder
|
||||||
album.SaveDir = singerFolder
|
album.SaveDir = singerFolder
|
||||||
//Get Quality
|
//Get Quality
|
||||||
@@ -1182,6 +1188,9 @@ func ripPlaylist(playlistId string, token string, storefront string, mediaUserTo
|
|||||||
if dl_atmos {
|
if dl_atmos {
|
||||||
singerFolder = filepath.Join(Config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
singerFolder = filepath.Join(Config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
||||||
}
|
}
|
||||||
|
if dl_aac {
|
||||||
|
singerFolder = filepath.Join(Config.AacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
|
||||||
|
}
|
||||||
os.MkdirAll(singerFolder, os.ModePerm) // Create artist folder
|
os.MkdirAll(singerFolder, os.ModePerm) // Create artist folder
|
||||||
playlist.SaveDir = singerFolder
|
playlist.SaveDir = singerFolder
|
||||||
//Get Quality
|
//Get Quality
|
||||||
@@ -2166,4 +2175,4 @@ func extractVideo(c string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return streamUrl.String(), nil
|
return streamUrl.String(), nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ type ConfigSet struct {
|
|||||||
CoverFormat string `yaml:"cover-format"`
|
CoverFormat string `yaml:"cover-format"`
|
||||||
AlacSaveFolder string `yaml:"alac-save-folder"`
|
AlacSaveFolder string `yaml:"alac-save-folder"`
|
||||||
AtmosSaveFolder string `yaml:"atmos-save-folder"`
|
AtmosSaveFolder string `yaml:"atmos-save-folder"`
|
||||||
|
AacSaveFolder string `yaml:"aac-save-folder"`
|
||||||
AlbumFolderFormat string `yaml:"album-folder-format"`
|
AlbumFolderFormat string `yaml:"album-folder-format"`
|
||||||
PlaylistFolderFormat string `yaml:"playlist-folder-format"`
|
PlaylistFolderFormat string `yaml:"playlist-folder-format"`
|
||||||
ArtistFolderFormat string `yaml:"artist-folder-format"`
|
ArtistFolderFormat string `yaml:"artist-folder-format"`
|
||||||
|
|||||||
Reference in New Issue
Block a user