mirror of
https://gitea.baerentsen.space/FrederikBaerentsen/PicardScripts.git
synced 2026-03-31 15:07:49 +01:00
Fix soundtrack path generation and unclosed $if statement. Fixed #2
This commit is contained in:
+16
-11
@@ -1066,47 +1066,52 @@ $noop( Podcasts - /Podcast/P/Podcast Name/ )
|
|||||||
$if(%_isPodcast%,%_podcastDirectory%$left($swapprefix($if2(%albumsort%,%album%),A,An,The),1)/,/)
|
$if(%_isPodcast%,%_podcastDirectory%$left($swapprefix($if2(%albumsort%,%album%),A,An,The),1)/,/)
|
||||||
|
|
||||||
$noop( Various Artists Compilations - /Various/V/Album Name/ )
|
$noop( Various Artists Compilations - /Various/V/Album Name/ )
|
||||||
$if(%_isVarious%,%_variousArtistsDirectory%$left($swapprefix($if2(%albumsort%,%album%),A,An,The),1)/,/
|
$if(%_isVarious%,%_variousArtistsDirectory%$left($swapprefix($if2(%albumsort%,%album%),A,An,The),1)/,/)
|
||||||
|
|
||||||
$noop( Global Compilations - /Compilations/C/Album Name/ )
|
$noop( Global Compilations - /Compilations/C/Album Name/ )
|
||||||
$if(%_isGlobalCompil%,%_compilationsGSubDirectory%$left($swapprefix($if2(%albumsort%,%album%),A,An,The),1)/,/)
|
$if(%_isGlobalCompil%,%_compilationsGSubDirectory%$left($swapprefix($if2(%albumsort%,%album%),A,An,The),1)/,/)
|
||||||
|
|
||||||
|
$noop( Steps 5-9 only apply to standard artist releases, not special collections )
|
||||||
|
$noop( Skip these steps for Soundtracks, Audiobooks, Podcasts, Various Artists, and Global Compilations )
|
||||||
|
$noop( Using _isSpecialCollection flag to control artist path generation )
|
||||||
|
$set(_isSpecialCollection,$or(%_isSoundTrack%,%_isAudiobook%,%_isPodcast%,%_isVarious%,%_isGlobalCompil%))
|
||||||
|
|
||||||
$noop( Step 5: Category/Genre Organization \(if configured\) )
|
$noop( Step 5: Category/Genre Organization \(if configured\) )
|
||||||
$if($eq(%_orderTypeForRoot%,1),
|
$if($and($not(%_isSpecialCollection%),$eq(%_orderTypeForRoot%,1)),
|
||||||
$if2(%albumgrouping%,Unknown)
|
$if2(%albumgrouping%,Unknown)
|
||||||
)/
|
)/
|
||||||
|
|
||||||
$noop( Step 6: Artist Initial Folder - B/, T/, W/ etc. )
|
$noop( Step 6: Artist Initial Folder - B/, T/, W/ etc. )
|
||||||
$noop( Example: "The Beatles" → "B/" or "Taylor Swift" → "T/" )
|
$noop( Example: "The Beatles" → "B/" or "Taylor Swift" → "T/" )
|
||||||
$if($eq(%_orderTypeForRoot%,2),
|
$if($and($not(%_isSpecialCollection%),$eq(%_orderTypeForRoot%,2)),
|
||||||
$if($eq(%_orderTypeForArtist%,1),$upper($firstalphachar($if2(%_albumartistForFilename%,%_artistForFilename%),#1)),
|
$if($eq(%_orderTypeForArtist%,1),$upper($firstalphachar($if2(%_albumartistForFilename%,%_artistForFilename%),#1)),
|
||||||
$if($eq(%_orderTypeForArtist%,2),$if(%_isGlobalCompil%,,$upper($firstalphachar($if2(%_albumartistsortForFilename%,%_artistsortForFilename%),#2))),
|
$if($eq(%_orderTypeForArtist%,2),$upper($firstalphachar($if2(%_albumartistsortForFilename%,%_artistsortForFilename%),#2)),
|
||||||
$if($eq(%_orderTypeForArtist%,3),)))
|
$if($eq(%_orderTypeForArtist%,3),)))
|
||||||
)/
|
)/
|
||||||
|
|
||||||
$noop( Step 7: Artist Name Folder )
|
$noop( Step 7: Artist Name Folder )
|
||||||
|
|
||||||
$noop( First Name Sort: "Madonna" → /M/Madonna/ )
|
$noop( First Name Sort: "Madonna" → /M/Madonna/ )
|
||||||
$if($eq(%_orderTypeForArtist%,1),$if2(%_artistSort%,%_albumartistForFilename%,%_artistForFilename%))/
|
$if($and($not(%_isSpecialCollection%),$eq(%_orderTypeForArtist%,1)),$if2(%_artistSort%,%_albumartistForFilename%,%_artistForFilename%))/
|
||||||
|
|
||||||
$noop( Last Name Sort: "Weird Al" → /Y/Yankovic, Weird Al/ )
|
$noop( Last Name Sort: "Weird Al" → /Y/Yankovic, Weird Al/ )
|
||||||
$if($eq(%_orderTypeForArtist%,2),$if(%_isGlobalCompil%,,$if2(%_albumartistsortForFilename%,%_artistsortForFilename%)))/
|
$if($and($not(%_isSpecialCollection%),$eq(%_orderTypeForArtist%,2)),$if2(%_albumartistsortForFilename%,%_artistsortForFilename%))/
|
||||||
|
|
||||||
$noop( No Separation: /Artist/ )
|
$noop( No Separation: /Artist/ )
|
||||||
$if($eq(%_orderTypeForArtist%,3),)/
|
$if($and($not(%_isSpecialCollection%),$eq(%_orderTypeForArtist%,3)),)/
|
||||||
|
|
||||||
$noop( Step 8: Tribute/Cover Album Alternate Artist Routing )
|
$noop( Step 8: Tribute/Cover Album Alternate Artist Routing )
|
||||||
$noop( Files tribute/cover under original artist if configured )
|
$noop( Files tribute/cover under original artist if configured )
|
||||||
$if($eq_all(%coverTributeSort%,%_altArtistSort%,%_isTribute%,1),
|
$if($and($not(%_isSpecialCollection%),$eq_all(%coverTributeSort%,%_altArtistSort%,%_isTribute%,1)),
|
||||||
$if2(%_artistSort%,%_albumartistForFilename%,%_artistForFilename%)
|
$if2(%_artistSort%,%_albumartistForFilename%,%_artistForFilename%)
|
||||||
)/
|
)/
|
||||||
|
|
||||||
$if($eq_all(%coverTributeSort%,%_altArtistSort%,%_isCover%,1),
|
$if($and($not(%_isSpecialCollection%),$eq_all(%coverTributeSort%,%_altArtistSort%,%_isCover%,1)),
|
||||||
$if2(%_artistSort%,%_albumartistForFilename%,%_artistForFilename%)
|
$if2(%_artistSort%,%_albumartistForFilename%,%_artistForFilename%)
|
||||||
)/
|
)/
|
||||||
|
|
||||||
$noop( Step 9: Album Type Subfolders - /Albums/, /Singles/, /Live/ )
|
$noop( Step 9: Album Type Subfolders - /Albums/, /Singles/, /Live/ )
|
||||||
$if($eq(%_separateByTypeInArtistDirectory%,1),
|
$if($and($not(%_isSpecialCollection%),$eq(%_separateByTypeInArtistDirectory%,1)),
|
||||||
$if($eq(%_isIncomplete%,1),%_incompleteSubDirectory%)
|
$if($eq(%_isIncomplete%,1),%_incompleteSubDirectory%)
|
||||||
$if($eq(%_isArtistCompil%,1),%_compilationsASubDirectory%,
|
$if($eq(%_isArtistCompil%,1),%_compilationsASubDirectory%,
|
||||||
$if($eq(%_isLive%,1),%_liveSubDirectory%,
|
$if($eq(%_isLive%,1),%_liveSubDirectory%,
|
||||||
@@ -1120,7 +1125,7 @@ $if($eq(%_separateByTypeInArtistDirectory%,1),
|
|||||||
$if($eq(%_isOther%,1),%_otherSubDirectory%,
|
$if($eq(%_isOther%,1),%_otherSubDirectory%,
|
||||||
$if($eq(%_isAlbum%,1),
|
$if($eq(%_isAlbum%,1),
|
||||||
$if($eq(%_separateAlbum%,1),%_albumSubDirectory%)
|
$if($eq(%_separateAlbum%,1),%_albumSubDirectory%)
|
||||||
)))))))))))))
|
))))))))))))
|
||||||
|
|
||||||
$noop( Step 10: Album Folder Name with Metadata )
|
$noop( Step 10: Album Folder Name with Metadata )
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user