diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6d095cc47..4b352922e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -44,7 +44,9 @@ before you start working on them :). ### Prerequisites -First, make sure that you have followed +First, you should use a server or PC with at least 4GB of RAM. Less RAM may lead to crashes. + +Make sure that you have followed [the steps](/support/doc/dependencies.md) to install the dependencies. @@ -173,4 +175,4 @@ $ npm run mocha -- --exit --require ts-node/register/type-check --bail server/te ``` Instance configurations are in `config/test-{1,2,3,4,5,6}.yaml`. -Note that only instance 2 has transcoding enabled. \ No newline at end of file +Note that only instance 2 has transcoding enabled. diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 88ea89639..8ff5713a1 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -38,6 +38,7 @@ export class AuthService { loginChangedSource: Observable userInformationLoaded = new ReplaySubject(1) hotkeys: Hotkey[] + redirectUrl: string private clientId: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID) private clientSecret: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET) @@ -177,6 +178,8 @@ export class AuthService { this.setStatus(AuthStatus.LoggedOut) this.hotkeysService.remove(this.hotkeys) + + this.redirectUrl = null } refreshAccessToken () { diff --git a/client/src/app/core/routing/login-guard.service.ts b/client/src/app/core/routing/login-guard.service.ts index 18bc41ca6..40ff8f505 100644 --- a/client/src/app/core/routing/login-guard.service.ts +++ b/client/src/app/core/routing/login-guard.service.ts @@ -20,6 +20,8 @@ export class LoginGuard implements CanActivate, CanActivateChild { canActivate (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { if (this.auth.isLoggedIn() === true) return true + this.auth.redirectUrl = state.url + this.router.navigate([ '/login' ]) return false } diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 267a2d857..fa585c883 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html @@ -19,7 +19,7 @@ or create an account - diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts index 4bae3ae5c..7553e6456 100644 --- a/client/src/app/login/login.component.ts +++ b/client/src/app/login/login.component.ts @@ -8,6 +8,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { LoginValidatorsService } from '@app/shared/forms/form-validators/login-validators.service' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' +import { Router } from '@angular/router' @Component({ selector: 'my-login', @@ -26,6 +27,7 @@ export class LoginComponent extends FormReactive implements OnInit { private openedForgotPasswordModal: NgbModalRef constructor ( + public router: Router, protected formValidatorService: FormValidatorService, private modalService: NgbModal, private loginValidatorsService: LoginValidatorsService, @@ -59,7 +61,7 @@ export class LoginComponent extends FormReactive implements OnInit { this.authService.login(username, password) .subscribe( - () => this.redirectService.redirectToHomepage(), + () => this.redirect(), err => { if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect username or password.') @@ -69,6 +71,15 @@ export class LoginComponent extends FormReactive implements OnInit { ) } + redirect () { + const redirect = this.authService.redirectUrl + if (redirect) { + this.router.navigate([ redirect ]) + } else { + this.redirectService.redirectToHomepage() + } + } + askResetPassword () { this.userService.askResetPassword(this.forgotPasswordEmail) .subscribe( diff --git a/client/src/app/shared/misc/help.component.html b/client/src/app/shared/misc/help.component.html index 5b3ddde1d..28ccb1e26 100644 --- a/client/src/app/shared/misc/help.component.html +++ b/client/src/app/shared/misc/help.component.html @@ -15,6 +15,7 @@ - +
{{ video.durationLabel }} diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.html b/client/src/app/videos/+video-watch/modal/video-download.component.html index edd054123..f46f92a17 100644 --- a/client/src/app/videos/+video-watch/modal/video-download.component.html +++ b/client/src/app/videos/+video-watch/modal/video-download.component.html @@ -5,10 +5,20 @@
-
- +
+
+
+ +
+ +
+ +
+
diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.scss b/client/src/app/videos/+video-watch/modal/video-download.component.scss index 6325f67a3..439cbb3e3 100644 --- a/client/src/app/videos/+video-watch/modal/video-download.component.scss +++ b/client/src/app/videos/+video-watch/modal/video-download.component.scss @@ -2,7 +2,13 @@ @import 'mixins'; .peertube-select-container { - @include peertube-select-container(130px); + @include peertube-select-container(100px); + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + + select { + height: inherit; + } } .download-type { diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.ts b/client/src/app/videos/+video-watch/modal/video-download.component.ts index f4d9003ee..b1b2c0623 100644 --- a/client/src/app/videos/+video-watch/modal/video-download.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-download.component.ts @@ -1,6 +1,8 @@ import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core' import { VideoDetails } from '../../../shared/video/video-details.model' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { NotificationsService } from 'angular2-notifications' @Component({ selector: 'my-video-download', @@ -15,7 +17,11 @@ export class VideoDownloadComponent implements OnInit { downloadType: 'direct' | 'torrent' | 'magnet' = 'torrent' resolutionId: number | string = -1 - constructor (private modalService: NgbModal) { } + constructor ( + private notificationsService: NotificationsService, + private modalService: NgbModal, + private i18n: I18n + ) { } ngOnInit () { this.resolutionId = this.video.files[0].resolution.id @@ -26,6 +32,10 @@ export class VideoDownloadComponent implements OnInit { } download () { + window.location.assign(this.getLink()) + } + + getLink () { // HTML select send us a string, so convert it to a number this.resolutionId = parseInt(this.resolutionId.toString(), 10) @@ -48,6 +58,11 @@ export class VideoDownloadComponent implements OnInit { } } })() - window.location.assign(link) + + return link + } + + activateCopiedMessage () { + this.notificationsService.success(this.i18n('Success'), this.i18n('Copied')) } } diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts index eca2ce6c3..5cea69eb8 100644 --- a/client/src/assets/player/peertube-player.ts +++ b/client/src/assets/player/peertube-player.ts @@ -69,7 +69,27 @@ function getVideojsOptions (options: { Object.assign(videojsOptions.plugins, { hotkeys: { enableVolumeScroll: false, - enableModifiersForNumbers: false + enableModifiersForNumbers: false, + customKeys: { + increasePlaybackRateKey: { + key: function (event) { + // use '>' + return event.which === 51 + }, + handler: function (player, options, event) { + player.playbackRate(player.playbackRate() + 0.1) + } + }, + decreasePlaybackRateKey: { + key: function (event) { + // use '<' + return event.which === 50 + }, + handler: function (player, options, event) { + player.playbackRate(player.playbackRate() - 0.1) + } + } + } } }) } diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md index 35812aa8b..d98d71020 100644 --- a/support/doc/dependencies.md +++ b/support/doc/dependencies.md @@ -1,5 +1,20 @@ # Dependencies + + + + +- [Debian / Ubuntu and derivatives](#debian--ubuntu-and-derivatives) +- [Arch Linux](#arch-linux) +- [CentOS 7](#centos-7) +- [Fedora](#fedora) +- [FreeBSD](#freebsd) +- [macOS](#macos) +- [Gentoo](#gentoo) +- [Other distributions](#other-distributions) + + + ## Debian / Ubuntu and derivatives 1. On a fresh Debian/Ubuntu, as root user, install basic utility programs needed for the installation @@ -31,6 +46,11 @@ $ sudo apt-get update $ sudo apt install ffmpeg ``` +Now that dependencies are installed, before running PeerTube you should start PostgreSQL and Redis: +``` +$ sudo systemctl start redis postgresql +``` + ## Arch Linux 1. Run: @@ -39,6 +59,11 @@ $ sudo apt install ffmpeg $ sudo pacman -S nodejs yarn ffmpeg postgresql openssl redis git wget unzip python2 base-devel npm nginx ``` +Now that dependencies are installed, before running PeerTube you should start PostgreSQL and Redis: +``` +$ sudo systemctl start redis postgresql +``` + ## CentOS 7 1. Install NodeJS 8.x (current LTS): @@ -68,6 +93,80 @@ Later when you invoke any node command, please prefix them with `CC=/opt/rh/devt $ sudo -H -u peertube CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ yarn install --production --pure-lockfile ``` +Now that dependencies are installed, before running PeerTube you should start PostgreSQL and Redis: +``` +$ sudo service redis start +$ sudo service postgresql start +``` + +## Fedora + +0. Upgrade your packages: +``` +dnf upgrade +``` +1. Add a user with sudoers group access: +``` +useradd my-peertube-user +passwd my-peertube-user +usermod my-peertube-user -a -G wheel # Add my-peertube-user to sudoers +su my-peertube-user +``` +2. (Optional) Install certbot (choose instructions for nginx and your distribution) : +[https://certbot.eff.org/all-instructions](https://certbot.eff.org/all-instructions) +3. Install NodeJS 8.x (current LTS): +[https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora](https://nodejs.org/en/download/package-manager/#enterprise-linux-and-fedora) +4. Install yarn: +[https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install) +5. Enable [RPM Fusion](https://rpmfusion.org) for Fedora (available for x86, x86_64, armhfp) +``` +sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm +``` +This is necessary because `ffmpeg` is not in the Fedora repos. + +6. Run: +``` +sudo dnf install nginx ffmpeg postgresql-server postgresql-contrib openssl gcc-c++ make redis git +ffmpeg -version # Should be >= 3.x +g++ -v # Should be >= 5.x +``` +7. Post-installation + +_from [PostgreSQL documentation](https://www.postgresql.org/download/linux/redhat/):_ +> Due to policies for Red Hat family distributions, the PostgreSQL installation will not be enabled for automatic start or have the database initialized automatically. +``` +# PostgreSQL +sudo postgresql-setup initdb +sudo systemctl enable postgresql.service +sudo systemctl start postgresql.service +# Nginx +sudo systemctl enable nginx.service +sudo systemctl start nginx.service +# Redis +sudo systemctl enable redis.service +sudo systemctl start redis.service +``` +8. Firewall + +By default, you cannot acces your server via public IP. To do so, you must configure firewall: +``` +# Ports used by peertube dev setup +sudo firewall-cmd --permanent --zone=public --add-port=3000/tcp +sudo firewall-cmd --permanent --zone=public --add-port=9000/tcp +# Optional +sudo firewall-cmd --permanent --zone=public --add-service=http +sudo firewall-cmd --permanent --zone=public --add-service=https +# Reload firewall +sudo firewall-cmd --reload +``` +9. Configure max ports + +This is necessary if you are running dev setup, otherwise you will have errors with `nodemon` +``` +echo fs.inotify.max_user_watches=582222 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p +``` +[More info](https://stackoverflow.com/questions/34662574/node-js-getting-error-nodemon-internal-watch-failed-watch-enospc#34664097) + ## FreeBSD On a fresh install of [FreeBSD](https://www.freebsd.org), new system or new jail: