-1

src/Core/UI/Page.elm

reviewed

··· 1 1 module UI.Page exposing (Page(..), fromUrl, rewriteUrl, sameBase, sources, toString) 2 2 3 3 - import Material.Icons exposing (collections) 4 3 import Maybe.Extra as Maybe 5 4 import Sources exposing (Service(..)) 6 5 import UI.Playlists.Page as Playlists

+1 -1

src/Core/UI/Types.elm

reviewed

··· 20 20 import LastFm 21 21 import Management 22 22 import Notifications exposing (Notification) 23 23 - import Playlists exposing (Playlist, PlaylistTrack, PlaylistTrackWithoutMetadata) 23 23 + import Playlists exposing (Playlist, PlaylistTrackWithoutMetadata) 24 24 import Queue 25 25 import Random 26 26 import Sources exposing (Source)

+1 -1

src/Core/UI/User/State/Export.elm

reviewed

··· 4 4 import File.Download 5 5 import Json.Encode 6 6 import List.Extra as List 7 7 - import Maybe.Extra as Maybe exposing (isJust) 7 7 + import Maybe.Extra as Maybe 8 8 import Playlists.Encoding as Playlists 9 9 import Return exposing (return) 10 10 import Settings exposing (Settings)

-1

src/Library/Playlists/Encoding.elm

reviewed

··· 4 4 import Json.Decode.Ext as Decode 5 5 import Json.Encode as Encode 6 6 import Json.Encode.Ext exposing (..) 7 7 - import Maybe.Extra as Maybe 8 7 import Playlists exposing (..) 9 8 import Time.Ext as Time 10 9

+1 -1

src/Library/Tracks.elm

reviewed

··· 3 3 import Base64 4 4 import List.Extra as List 5 5 import Maybe.Extra as Maybe 6 6 - import Playlists exposing (Playlist, PlaylistTrack, PlaylistTrackWithoutMetadata) 6 6 + import Playlists exposing (Playlist, PlaylistTrackWithoutMetadata) 7 7 import String.Ext as String 8 8 import Time 9 9 import Time.Ext as Time

+19 -5

src/Library/Tracks/Collection/Internal/Arrange.elm

reviewed

··· 21 21 arrange ( deps, collection ) = 22 22 case deps.selectedPlaylist of 23 23 Just playlist -> 24 24 - case playlist.autoGenerated of 25 25 - Just _ -> 26 26 - arrangeByGroup ( deps, collection ) 24 24 + if playlist.collection then 25 25 + case playlist.autoGenerated of 26 26 + Just _ -> 27 27 + arrangeByGroup ( deps, collection ) 27 28 28 28 - Nothing -> 29 29 - arrangeByPlaylist ( deps, collection ) playlist 29 29 + Nothing -> 30 30 + arrangeByCollection ( deps, collection ) playlist 31 31 + 32 32 + else 33 33 + arrangeByPlaylist ( deps, collection ) playlist 30 34 31 35 Nothing -> 32 36 arrangeByGroup ( deps, collection ) ··· 243 247 244 248 245 249 -- PLAYLISTS 250 250 + 251 251 + 252 252 + arrangeByCollection : Parcel -> Playlist -> Parcel 253 253 + arrangeByCollection ( deps, collection ) playlist = 254 254 + collection.identified 255 255 + |> Playlists.Matching.match playlist 256 256 + |> dealWithMissingPlaylistTracks 257 257 + |> Sorting.sort deps.sortBy deps.sortDirection 258 258 + |> (\x -> { collection | arranged = x }) 259 259 + |> (\x -> ( deps, x )) 246 260 247 261 248 262 arrangeByPlaylist : Parcel -> Playlist -> Parcel