Clean

src/Core.elm

@@ -1,4 +1,4 @@
-module Core exposing (FullModel(..), Model, Msg(..), Page(..), init, subscriptions, update)
+module Core exposing (Model, Msg(..), Page(..), init, subscriptions, update)
 
 import Browser
 import Browser.Events as Events
@@ -15,11 +15,6 @@ import Twitch
 import Url
 
 
-type FullModel
-    = Unloaded Element.Device Url.Url Nav.Key Time.Zone
-    | Loaded Model
-
-
 type alias Model =
     { playlists : List Twitch.Playlist
     , zone : Time.Zone
@@ -27,6 +22,7 @@ type alias Model =
     , key : Nav.Key
     , device : Element.Device
     , time : Time.Posix
+    , url : Url.Url
     }
 
 
@@ -53,9 +49,9 @@ type Msg
     | TimeReceived Time.Posix
 
 
-init : { width : Int, height : Int } -> Url.Url -> Nav.Key -> ( FullModel, Cmd Msg )
+init : { width : Int, height : Int } -> Url.Url -> Nav.Key -> ( Model, Cmd Msg )
 init { width, height } url key =
-    ( Unloaded (Element.classifyDevice { width = width, height = height }) url key Time.utc
+    ( Model [] Time.utc (Home Nothing) key (Element.classifyDevice { width = width, height = height }) (Time.millisToPosix 0) url
     , Cmd.batch
         [ Task.attempt TimeZoneReceivedResult TimeZone.getZone
         , Twitch.fetchPlaylists resultToMsg
@@ -73,7 +69,7 @@ resultToMsg result =
             Noop
 
 
-subscriptions : FullModel -> Sub Msg
+subscriptions : Model -> Sub Msg
 subscriptions _ =
     Sub.batch
         [ Events.onResize (\w h -> SizeReceived w h)
@@ -81,94 +77,84 @@ subscriptions _ =
         ]
 
 
-update : Msg -> FullModel -> ( FullModel, Cmd Msg )
+update : Msg -> Model -> ( Model, Cmd Msg )
 update msg model =
     case ( msg, model ) of
         ( Noop, _ ) ->
             ( model, Cmd.none )
 
-        ( TimeZoneReceived z, Unloaded d u k _ ) ->
+        ( TimeZoneReceived z, m ) ->
-            ( Unloaded d u k z, Cmd.none )
+            ( { m | zone = z }, Cmd.none )
 
-        ( TimeZoneReceived z, Loaded m ) ->
+        ( TimeZoneReceivedResult (Ok ( _, zone )), m ) ->
-            ( Loaded { m | zone = z }, Cmd.none )
+            ( { m | zone = zone }, Cmd.none )
-
-        ( TimeZoneReceivedResult (Ok ( _, zone )), Unloaded d u k _ ) ->
-            ( Unloaded d u k zone, Cmd.none )
-
-        ( TimeZoneReceivedResult (Ok ( _, zone )), Loaded m ) ->
-            ( Loaded { m | zone = zone }, Cmd.none )
 
         ( TimeZoneReceivedResult (Err _), _ ) ->
             ( model, Task.perform TimeZoneReceived Time.here )
 
-        ( TimeReceived p, Loaded m ) ->
+        ( TimeReceived p, m ) ->
-            ( Loaded { m | time = p }, Cmd.none )
+            ( { m | time = p }, Cmd.none )
 
-        ( HoverPlaylist hover, Loaded m ) ->
+        ( HoverPlaylist hover, m ) ->
             case m.page of
                 Home Nothing ->
-                    ( Loaded { m | page = Home (Just (Hover.hover hover m.time)) }, Cmd.none )
+                    ( { m | page = Home (Just (Hover.hover hover m.time)) }, Cmd.none )
 
                 _ ->
-                    ( Loaded m, Cmd.none )
+                    ( m, Cmd.none )
 
-        ( HoverVideo hover, Loaded m ) ->
+        ( HoverVideo hover, m ) ->
             case m.page of
                 Playlist p Nothing ->
-                    ( Loaded { m | page = Playlist p (Just (Hover.hover hover m.time)) }, Cmd.none )
+                    ( { m | page = Playlist p (Just (Hover.hover hover m.time)) }, Cmd.none )
 
                 Video p v Nothing ->
-                    ( Loaded { m | page = Video p v (Just (Hover.hover v m.time)) }, Cmd.none )
+                    ( { m | page = Video p v (Just (Hover.hover v m.time)) }, Cmd.none )
 
                 _ ->
-                    ( Loaded m, Cmd.none )
+                    ( m, Cmd.none )
 
-        ( Unhover, Loaded m ) ->
+        ( Unhover, m ) ->
             case m.page of
                 Home _ ->
-                    ( Loaded { m | page = Home Nothing }, Cmd.none )
+                    ( { m | page = Home Nothing }, Cmd.none )
 
                 Playlist p _ ->
-                    ( Loaded { m | page = Playlist p Nothing }, Cmd.none )
+                    ( { m | page = Playlist p Nothing }, Cmd.none )
 
                 Video p v _ ->
-                    ( Loaded { m | page = Video p v Nothing }, Cmd.none )
+                    ( { m | page = Video p v Nothing }, Cmd.none )
 
-        ( SizeReceived w h, Loaded m ) ->
+        ( SizeReceived w h, m ) ->
-            ( Loaded { m | device = Element.classifyDevice { width = w, height = h } }
+            ( { m | device = Element.classifyDevice { width = w, height = h } }
             , Cmd.none
             )
 
-        ( PlaylistsReceived playlists, Unloaded device url key zone ) ->
+        ( PlaylistsReceived playlists, m ) ->
             update
-                (UrlReceived url)
+                (UrlReceived m.url)
-                (Loaded
+                { m | playlists = playlists, page = Home Nothing }
-                    { key = key
-                    , playlists = playlists
-                    , zone = zone
-                    , page = Home Nothing
-                    , device = device
-                    , time = Time.millisToPosix 0
-                    }
-                )
 
-        ( HomeClicked, Loaded m ) ->
+        ( HomeClicked, m ) ->
             ( model
             , Nav.pushUrl m.key "#"
             )
 
-        ( PlaylistClicked playlist, Loaded m ) ->
+        ( PlaylistClicked playlist, m ) ->
             ( model
             , Nav.pushUrl m.key ("#" ++ playlist.url)
             )
 
-        ( VideoClicked playlist video, Loaded m ) ->
+        ( VideoClicked playlist video, m ) ->
             ( model
             , Nav.pushUrl m.key ("#" ++ playlist.url ++ video.url)
             )
 
-        ( UrlReceived url, Loaded m ) ->
+        ( UrlReceived url, m ) ->
+            if List.isEmpty m.playlists then
+                ( { m | url = url }, Cmd.none )
+
+            else
                 let
                     splits =
                         String.split "?" (Maybe.withDefault "" url.fragment)
@@ -238,9 +224,9 @@ update msg model =
                             _ ->
                                 Ports.eraseVideo ()
                 in
-            ( Loaded { m | page = page }, Cmd.batch [ cmd, extraCmd ] )
+                ( { m | page = page }, Cmd.batch [ cmd, extraCmd ] )
 
-        ( UrlRequested u, Loaded m ) ->
+        ( UrlRequested u, m ) ->
             case u of
                 Browser.Internal url ->
                     ( model, Nav.pushUrl m.key (Url.toString url) )
@@ -248,9 +234,6 @@ update msg model =
                 Browser.External s ->
                     ( model, Nav.load s )
 
-        _ ->
-            ( model, Cmd.none )
-
 
 splitter : String -> Maybe ( String, String )
 splitter input =

src/Main.elm

@@ -5,7 +5,7 @@ import Core
 import Views
 
 
-main : Program { width : Int, height : Int } Core.FullModel Core.Msg
+main : Program { width : Int, height : Int } Core.Model Core.Msg
 main =
     Browser.application
         { init = Core.init

src/Views.elm

@@ -21,16 +21,16 @@ import Twitch
 import Ui
 
 
-view : Core.FullModel -> Browser.Document Core.Msg
+view : Core.Model -> Browser.Document Core.Msg
 view model =
     let
         element =
-            case model of
+            case model.playlists of
-                Core.Unloaded _ _ _ _ ->
+                [] ->
                     Element.el [ Element.padding 10, Element.centerX ] spinner
 
-                Core.Loaded m ->
+                _ ->
-                    viewContent m
+                    viewContent model
     in
     { title = title model
     , body =
@@ -47,14 +47,9 @@ view model =
     }
 
 
-title : Core.FullModel -> String
+title : Core.Model -> String
 title model =
-    case model of
+    case model.page of
-        Core.Unloaded _ _ _ _ ->
-            Consts.url
-
-        Core.Loaded m ->
-            case m.page of
         Core.Home _ ->
             Consts.url