Skip to content

Add link to media with time #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WTFKr0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add link to media with time #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d89390
Init
WTFKr0 Dec 1, 2017
c8c1f83
Add time
WTFKr0 Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ type response struct {
// Search
Query string

List *List
Lists []*List
Media *Media
Medias []*Media
List *List
Lists []*List
Media *Media
Medias []*Media
DefaultMediaID int
DefaultMediaTime int64

ActiveMedias []*Media
QueuedMedias []*Media
Expand Down Expand Up @@ -470,6 +472,23 @@ func playList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
var medias []*Media
db.Model(&list).Related(&medias, "Medias")
res.Medias = medias
res.DefaultMediaID = 0
res.DefaultMediaTime = 0

if query := strings.TrimSpace(r.FormValue("m")); query != "" {
// Default media ID
for k, m := range res.Medias {
if m.ID == query {
res.DefaultMediaID = k
}
}
}

if query := strings.TrimSpace(r.FormValue("t")); query != "" {
// Default time
res.DefaultMediaTime, _ = strconv.ParseInt(query, 10, 64)
}

html(w, "play.html", res)
}

Expand Down
13 changes: 10 additions & 3 deletions templates/play.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,21 @@ <h2 class="ui center aligned inverted sub header">


// set initial item to first one.
$player.attr('src', playlist[0]);
$player.data('index', 0);
var id = {{$.DefaultMediaID}};
$player.attr('src', playlist[id]);
$player.data('index', id);
$('.player-item').removeClass('active');
$('#player-item-0').addClass('active');
$('#player-item-'+id).addClass('active');
// $player.focus();

// Set cur time
$player[0].currentTime = {{$.DefaultMediaTime}};

// set volume
$player.prop('volume', {{$.Config.Volume}});

// Auto Play
console.log($player);
});
</script>

Expand Down