tforgione
/
elm-twitch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues

This commit is contained in:
Thomas Forgione 2020-10-04 17:06:03 +02:00
parent 55fc0437a4
commit bb3a912cf3
4 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
index.html
View File

@ -15,18 +15,11 @@
node: document.getElementById('container') node: document.getElementById('container')
}); });
function setup(args) {
if (document.getElementById(args[0]) != undefined) {
vd.setup(args[0], args[1] + "/manifest.mpd")
} else {
setTimeout(function() {
setup(args);
}, 50);
}
}
app.ports.registerVideo.subscribe(function(args) { app.ports.registerVideo.subscribe(function(args) {
setup(args); requestAnimationFrame(function() {
console.log(args);
vd.setup(args[0], args[1] + "/manifest.mpd")
});
}); });
</script> </script>
</body> </body>

5
src/Core.elm
View File

@ -1,7 +1,6 @@
module Core exposing (FullModel(..), Model, Msg(..), Page(..), init, update) module Core exposing (FullModel(..), Model, Msg(..), Page(..), init, update)
import Browser.Navigation as Nav import Browser.Navigation as Nav
import Consts
import Json.Decode as Decode import Json.Decode as Decode
import Ports import Ports
import Task import Task
@ -70,7 +69,7 @@ update msg model =
( Loaded { m | page = Video playlist video } ( Loaded { m | page = Video playlist video }
, Cmd.batch , Cmd.batch
[ Nav.pushUrl m.key ("#" ++ playlist.url ++ Twitch.videoName video) [ Nav.pushUrl m.key ("#" ++ playlist.url ++ Twitch.videoName video)
, Ports.registerVideo ( "video", video.url ) , Ports.registerVideo ( Twitch.videoId video, video.url )
] ]
) )
@ -105,7 +104,7 @@ update msg model =
case ( playlist, video ) of case ( playlist, video ) of
( Just p, Just v ) -> ( Just p, Just v ) ->
( Video p v ( Video p v
, Ports.registerVideo ( Consts.videoId, v.url ) , Ports.registerVideo ( Twitch.videoId v, v.url )
) )
( Just p, Nothing ) -> ( Just p, Nothing ) ->

6
src/Twitch.elm
View File

@ -3,6 +3,7 @@ module Twitch exposing
, Video , Video
, fetchPlaylists , fetchPlaylists
, playlistMiniatureUrl , playlistMiniatureUrl
, videoId
, videoMiniatureUrl , videoMiniatureUrl
, videoName , videoName
) )
@ -35,6 +36,11 @@ videoName video =
String.join "/" (List.drop 3 (String.split "/" video.url)) String.join "/" (List.drop 3 (String.split "/" video.url))
videoId : Video -> String
videoId video =
String.dropLeft 1 video.url |> String.replace "/" "-"
get : { url : String, resolver : Http.Resolver x a } -> Task x a get : { url : String, resolver : Http.Resolver x a } -> Task x a
get { url, resolver } = get { url, resolver } =
Http.task Http.task

37
src/Views.elm
View File

@ -9,6 +9,7 @@ import Element.Background as Background
import Element.Border as Border import Element.Border as Border
import Element.Font as Font import Element.Font as Font
import Element.Input as Input import Element.Input as Input
import Element.Keyed as Keyed
import Html import Html
import Html.Attributes import Html.Attributes
import Json.Encode as Encode import Json.Encode as Encode
@ -228,9 +229,16 @@ videoMiniatureView zone playlist video =
button button
videoInList : Time.Zone -> Twitch.Playlist -> Twitch.Video -> Element Core.Msg videoInList : Time.Zone -> Twitch.Playlist -> Twitch.Video -> Twitch.Video -> Element Core.Msg
videoInList zone playlist video = videoInList zone playlist activeVideo video =
let let
msg =
if video == activeVideo then
Nothing
else
Just (Core.VideoClicked playlist video)
label = label =
Element.row [ Element.width Element.fill, Element.spacing 10 ] Element.row [ Element.width Element.fill, Element.spacing 10 ]
[ Element.el [ Element.width (Element.fillPortion 2) ] [ Element.el [ Element.width (Element.fillPortion 2) ]
@ -240,7 +248,7 @@ videoInList zone playlist video =
] ]
in in
Input.button [ Element.width Element.fill ] Input.button [ Element.width Element.fill ]
{ label = label, onPress = Just (Core.VideoClicked playlist video) } { label = label, onPress = msg }
videoView : Time.Zone -> Twitch.Playlist -> Twitch.Video -> Element Core.Msg videoView : Time.Zone -> Twitch.Playlist -> Twitch.Video -> Element Core.Msg
@ -250,15 +258,18 @@ videoView zone playlist video =
[ Element.width (Element.fillPortion 2) [ Element.width (Element.fillPortion 2)
, Element.htmlAttribute (Html.Attributes.style "height" "auto") , Element.htmlAttribute (Html.Attributes.style "height" "auto")
] ]
[ Element.html [ Keyed.el [ Element.width Element.fill ]
(Html.video ( video.url
[ Html.Attributes.id Consts.videoId , Element.html
, Html.Attributes.class "video-js vjs-default-skin wf" (Html.video
, Html.Attributes.property "data-setup" (Encode.string "{\"fluid\": true}") [ Html.Attributes.id (Twitch.videoId video)
, Html.Attributes.controls True , Html.Attributes.class "video-js vjs-default-skin wf"
, Html.Attributes.autoplay True , Html.Attributes.property "data-setup" (Encode.string "{\"fluid\": true}")
] , Html.Attributes.controls True
[] , Html.Attributes.autoplay True
]
[]
)
) )
, Element.paragraph , Element.paragraph
[ Font.size Consts.homeFontSize [ Font.size Consts.homeFontSize
@ -271,7 +282,7 @@ videoView zone playlist video =
[ Element.text ("Diffusé le " ++ formatDate zone video.date) ] [ Element.text ("Diffusé le " ++ formatDate zone video.date) ]
] ]
, Element.column [ Element.alignTop, Element.spacing 10, Element.width (Element.fillPortion 1) ] , Element.column [ Element.alignTop, Element.spacing 10, Element.width (Element.fillPortion 1) ]
(List.map (videoInList zone playlist) playlist.videos) (List.map (videoInList zone playlist video) playlist.videos)
] ]