Commit 4470a41a authored by Simon Kirsten's avatar Simon Kirsten
Browse files

Merge branch 'upgrade-mkdocs-material' into 'master'

Upgrade mkdocs-material, fix CI and volume=0

See merge request !2
parents df69ce56 34e620d5
Pipeline #43886 passed with stages
in 2 minutes and 37 seconds
...@@ -6,13 +6,13 @@ docs: ...@@ -6,13 +6,13 @@ docs:
before_script: before_script:
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends gcc - apt-get install -y --no-install-recommends gcc git
# TODO: we should consider also version locking these packages: # TODO: we should consider also version locking these packages:
# ++ everything will work in the future # ++ everything will work in the future
# -- we won't see any future improvements of the mkdocs and mkdocs-material packages # -- we won't see any future improvements of the mkdocs and mkdocs-material packages
- pip install mkdocs - pip install mkdocs
- pip install mkdocs-material - pip install mkdocs-material mkdocs-minify-plugin mkdocs-git-revision-date-localized-plugin
# This is my own extension that we use to insert the $VERSION env variable into the documentation # This is my own extension that we use to insert the $VERSION env variable into the documentation
- pip install pymdown-env - pip install pymdown-env
......
# Changelog # Changelog
### v0.9.15 <small>_June 16, 2020_</small>
* Server: Fixed chat
* Server: Fixed `volume=0` not working
* CI: Fixed build
* Docs: Upgraded mkdocs-material
### v0.9.14 <small>_January 3, 2020_</small> ### v0.9.14 <small>_January 3, 2020_</small>
* Server: Fixed channelsToIDCache not being initialized * Server: Fixed channelsToIDCache not being initialized
......
...@@ -5,4 +5,3 @@ ...@@ -5,4 +5,3 @@
* <simon.kirsten@stud.h-da.de> * <simon.kirsten@stud.h-da.de>
* <https://github.com/skirsten> * <https://github.com/skirsten>
* `Simon#2307` on Discord * `Simon#2307` on Discord
* `simon.kirsten@stud.h-da.de` on Slack
\ No newline at end of file
...@@ -25,16 +25,18 @@ The Stream Server is written in [Go](https://golang.org). It uses [Go Modules](h ...@@ -25,16 +25,18 @@ The Stream Server is written in [Go](https://golang.org). It uses [Go Modules](h
The `cmd/` directory contains only the `stream-server` command. The code of the server is in `internal/server` and the static files for the playback website in `internal/static`. The `cmd/` directory contains only the `stream-server` command. The code of the server is in `internal/server` and the static files for the playback website in `internal/static`.
`pkg/` contains project independent code to access the Twitch API. This separation is done in accordance to the [Standard Go Project Layout](https://github.com/golang-standards/project-layout). `pkg/` contains project independent code to access the Twitch API. This separation is done in accordance to the [Standard Go Project Layout](https://github.com/golang-standards/project-layout).
Local development (requires go 1.12 and a Twitch client id): Local development (requires go 1.13 and a Twitch client id):
``` bash tab="bash" linenums="1" === "bash"
env TWITCH_CLIENT_ID="your client id here" go run ./cmd/stream-server ``` bash linenums="1"
``` env TWITCH_CLIENT_ID="your client id here" go run ./cmd/stream-server
```
``` PowerShell tab="PowerShell" linenums="1"
$env:TWITCH_CLIENT_ID="your client id here" === "PowerShell"
go run .\cmd\stream-server ``` PowerShell linenums="1"
``` $env:TWITCH_CLIENT_ID="your client id here"
go run .\cmd\stream-server
```
CI pipeline: `.gitlab-ci-server.yml` CI pipeline: `.gitlab-ci-server.yml`
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Download ## Download
Version `~~~${VERSION}~~~` Version `~~~${VERSION}~~~` [changelog](about/changelog.md)
OS | CPU Platform | Download OS | CPU Platform | Download
--------------- | ------------- | ---------------------------------------------------------------------- --------------- | ------------- | ----------------------------------------------------------------------
......
...@@ -56,7 +56,10 @@ function updateState(newState) { ...@@ -56,7 +56,10 @@ function updateState(newState) {
if (state.large_channel != "") { if (state.large_channel != "") {
function update() { function update() {
// the volume needs to be changed // the volume needs to be changed
if (large_player.getVolume() != state.volume) { if (state.volume == 0) {
large_player.setMuted(true);
} else {
large_player.setMuted(false);
large_player.setVolume(state.volume); large_player.setVolume(state.volume);
} }
......
...@@ -12,23 +12,26 @@ repo_url: https://code.fbi.h-da.de/stream-server/stream-server ...@@ -12,23 +12,26 @@ repo_url: https://code.fbi.h-da.de/stream-server/stream-server
# Configuration # Configuration
theme: theme:
name: 'material' name: "material"
language: en language: en
# palette: palette:
# primary: 'blue grey' scheme: slate
# accent: 'light blue grey' primary: lime
feature: accent: lime
tabs: true icon:
repo: fontawesome/brands/gitlab
features:
- instant
# Plugins # Plugins
plugins: plugins:
- search - search
- git-revision-date-localized
- minify: - minify:
minify_html: true minify_html: true
# Customization # Customization
extra: # extra:
repo_icon: gitlab
# Extensions # Extensions
markdown_extensions: markdown_extensions:
...@@ -57,21 +60,22 @@ markdown_extensions: ...@@ -57,21 +60,22 @@ markdown_extensions:
- pymdownx.tasklist: - pymdownx.tasklist:
custom_checkbox: true custom_checkbox: true
- pymdownx.tilde - pymdownx.tilde
- pymdownx.tabbed
- pymdown_env - pymdown_env
# Page tree # Page tree
nav: nav:
- Stream Server: - Stream Server:
- Project: index.md - Project: index.md
- Download and Run: download-and-run.md - Download and Run: download-and-run.md
- Options: options.md - Options: options.md
- Quickstart: quickstart.md - Quickstart: quickstart.md
- Reference: reference.md - Reference: reference.md
- Android Integration: android-integration.md - Android Integration: android-integration.md
- About: - About:
- Changelog: about/changelog.md - Changelog: about/changelog.md
- Contributing: about/contributing.md - Contributing: about/contributing.md
- Author's Notes: about/authors-notes.md - Author's Notes: about/authors-notes.md
- Previous Considerations: about/previous-considerations.md - Previous Considerations: about/previous-considerations.md
- License: about/license.md - License: about/license.md
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment