<div class="transcoding-information" *ngIf="isTranscodingInformationDisplayed()">
Transcoding is enabled on server. The video quota only take in account <strong>original</strong> video. <br />
- In maximum, this user could use ~ {{ computeQuotaWithTranscoding() | bytes }}.
+ In maximum, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}.
</div>
</div>
</div>
<div class="file-max-size">(extensions: {{ avatarExtensions }}, max size: {{ maxAvatarSize | bytes }})</div>
+<div class="user-quota">
+ <span class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ user.videoQuota | bytes: 0 }}
+</div>
+
<div class="account-title">Account settings</div>
<my-account-change-password></my-account-change-password>
-<div class="account-title">Videos</div>
+<div class="account-title">Video settings</div>
<my-account-details [user]="user"></my-account-details>
top: -10px;
}
+.user-quota {
+ font-size: 15px;
+ margin-top: 20px;
+
+ .user-quota-label {
+ font-weight: $font-semibold;
+ }
+}
+
.account-title {
text-transform: uppercase;
color: $orange-color;
@ViewChild('avatarfileInput') avatarfileInput
user: User = null
+ userVideoQuotaUsed = 0
constructor (
private userService: UserService,
ngOnInit () {
this.user = this.authService.getUser()
+
+ this.userService.getMyVideoQuotaUsed()
+ .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed)
}
getAvatarUrl () {
import { UserLogin } from '../../../../../shared/models/users/user-login.model'
import { environment } from '../../../environments/environment'
import { RestExtractor } from '../../shared/rest'
-import { UserConstructorHash } from '../../shared/users/user.model'
import { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
this.mergeUserInformation(obj)
.subscribe(
res => {
- this.user.displayNSFW = res.displayNSFW
- this.user.autoPlayVideo = res.autoPlayVideo
- this.user.role = res.role
- this.user.videoChannels = res.videoChannels
- this.user.account = res.account
-
+ this.user.patch(res)
this.user.save()
this.userInformationLoaded.next(true)
}
private handleLogin (obj: UserLoginWithUserInformation) {
- const hashUser: UserConstructorHash = {
- id: obj.id,
- username: obj.username,
- role: obj.role,
- email: obj.email,
- displayNSFW: obj.displayNSFW,
- autoPlayVideo: obj.autoPlayVideo,
- videoQuota: obj.videoQuota,
- videoChannels: obj.videoChannels,
- account: obj.account
- }
const hashTokens = {
accessToken: obj.access_token,
tokenType: obj.token_type,
refreshToken: obj.refresh_token
}
- this.user = new AuthUser(hashUser, hashTokens)
+ this.user = new AuthUser(obj, hashTokens)
this.user.save()
this.setStatus(AuthStatus.LoggedIn)
getAvatarUrl () {
return Account.GET_ACCOUNT_AVATAR_URL(this.account)
}
+
+ patch (obj: UserServerModel) {
+ for (const key of Object.keys(obj)) {
+ this[key] = obj[key]
+ }
+ }
}
.catch(res => this.restExtractor.handleError(res))
}
- getMyInformation () {
- const url = UserService.BASE_USERS_URL + 'me'
+ getMyVideoQuotaUsed () {
+ const url = UserService.BASE_USERS_URL + '/me/video-quota-used'
return this.authHttp.get(url)
- .map((userHash: any) => new User(userHash))
.catch(res => this.restExtractor.handleError(res))
}
}
Upload your video
</div>
- <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
-
<div *ngIf="!isUploadingVideo" class="upload-video-container">
<div class="upload-video">
<div class="icon icon-upload"></div>
import { Component, OnInit, ViewChild } from '@angular/core'
import { FormBuilder, FormGroup } from '@angular/forms'
import { Router } from '@angular/router'
+import { UserService } from '@app/shared'
import { NotificationsService } from 'angular2-notifications'
+import { BytesPipe } from 'ngx-pipes'
import { VideoPrivacy } from '../../../../../shared/models/videos'
import { AuthService, ServerService } from '../../core'
import { FormReactive } from '../../shared'
uuid: ''
}
- error: string = null
form: FormGroup
formErrors: { [ id: string ]: string } = {}
validationMessages: ValidatorMessage = {}
userVideoChannels = []
+ userVideoQuotaUsed = 0
videoPrivacies = []
firstStepPrivacyId = 0
firstStepChannelId = 0
private router: Router,
private notificationsService: NotificationsService,
private authService: AuthService,
+ private userService: UserService,
private serverService: ServerService,
private videoService: VideoService
) {
populateAsyncUserVideoChannels(this.authService, this.userVideoChannels)
.then(() => this.firstStepChannelId = this.userVideoChannels[0].id)
+ this.userService.getMyVideoQuotaUsed()
+ .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed)
+
this.serverService.videoPrivaciesLoaded
.subscribe(
() => {
uploadFirstStep () {
const videofile = this.videofileInput.nativeElement.files[0]
+ const videoQuota = this.authService.getUser().videoQuota
+ if ((this.userVideoQuotaUsed + videofile.size) > videoQuota) {
+ const bytePipes = new BytesPipe()
+
+ const msg = 'Your video quota is exceeded with this video ' +
+ `(video size: ${bytePipes.transform(videofile.size, 0)}, ` +
+ `used: ${bytePipes.transform(this.userVideoQuotaUsed, 0)}, ` +
+ `quota: ${bytePipes.transform(videoQuota, 0)})`
+ this.notificationsService.error('Error', msg)
+ return
+ }
+
const name = videofile.name.replace(/\.[^/.]+$/, '')
const privacy = this.firstStepPrivacyId.toString()
const nsfw = false
err => {
// Reset progress
+ this.isUploadingVideo = false
this.videoUploadPercents = 0
- this.error = err.message
+ this.notificationsService.error('Error', err.message)
}
)
}
},
err => {
- this.error = 'Cannot update the video.'
+ this.notificationsService.error('Error', err.message)
console.error(err)
}
)
export class VideoUpdateComponent extends FormReactive implements OnInit {
video: VideoEdit
- error: string = null
form: FormGroup
formErrors: { [ id: string ]: string } = {}
validationMessages: ValidatorMessage = {}
err => {
console.error(err)
- this.error = 'Cannot fetch video.'
+ this.notificationsService.error('Error', err.message)
}
)
}
},
err => {
- this.error = 'Cannot update the video.'
+ this.notificationsService.error('Error', err.message)
console.error(err)
}
)
asyncMiddleware(getUserInformation)
)
+usersRouter.get('/me/video-quota-used',
+ authenticate,
+ asyncMiddleware(getUserVideoQuotaUsed)
+)
+
usersRouter.get('/me/videos',
authenticate,
paginationValidator,
return res.json(user.toFormattedJSON())
}
+async function getUserVideoQuotaUsed (req: express.Request, res: express.Response, next: express.NextFunction) {
+ // We did not load channels in res.locals.user
+ const user = await UserModel.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
+ const videoQuotaUsed = await UserModel.getOriginalVideoFileTotalFromUser(user)
+
+ return res.json({
+ videoQuotaUsed
+ })
+}
+
function getUser (req: express.Request, res: express.Response, next: express.NextFunction) {
- return res.json(res.locals.user.toFormattedJSON())
+ return res.json((res.locals.user as UserModel).toFormattedJSON())
}
async function getUserVideoRating (req: express.Request, res: express.Response, next: express.NextFunction) {
return UserModel.findOne(query)
}
- private static getOriginalVideoFileTotalFromUser (user: UserModel) {
+ static getOriginalVideoFileTotalFromUser (user: UserModel) {
// Don't use sequelize because we need to use a sub query
const query = 'SELECT SUM("size") AS "total" FROM ' +
'(SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' +
import 'mocha'
import { UserRole } from '../../../../shared/index'
import {
- createUser, flushTests, getBlacklistedVideosList, getMyUserInformation, getMyUserVideoRating, getUserInformation, getUsersList,
+ createUser, flushTests, getBlacklistedVideosList, getMyUserInformation, getMyUserVideoQuotaUsed, getMyUserVideoRating, getUserInformation,
+ getUsersList,
getUsersListPaginationAndSort, getVideosList, killallServers, login, makePutBodyRequest, rateVideo, registerUser, removeUser, removeVideo,
runServer, ServerInfo, serverLogin, testVideoImage, updateMyAvatar, updateMyUser, updateUser, uploadVideo
} from '../../utils/index'
this.timeout(5000)
const videoAttributes = {
- name: 'super user video'
+ name: 'super user video',
+ fixture: 'video_short.webm'
}
await uploadVideo(server.url, accessTokenUser, videoAttributes)
})
+ it('Should have video quota updated', async function () {
+ const res = await getMyUserVideoQuotaUsed(server.url, accessTokenUser)
+ const data = res.body
+
+ expect(data.videoQuotaUsed).to.equal(218910)
+ })
+
it('Should be able to list my videos', async function () {
const res = await getMyVideos(server.url, accessTokenUser, 0, 5)
expect(res.body.total).to.equal(1)
.expect('Content-Type', /json/)
}
+function getMyUserVideoQuotaUsed (url: string, accessToken: string, specialStatus = 200) {
+ const path = '/api/v1/users/me/video-quota-used'
+
+ return request(url)
+ .get(path)
+ .set('Accept', 'application/json')
+ .set('Authorization', 'Bearer ' + accessToken)
+ .expect(specialStatus)
+ .expect('Content-Type', /json/)
+}
+
function getUserInformation (url: string, accessToken: string, userId: number) {
const path = '/api/v1/users/' + userId
registerUser,
getMyUserInformation,
getMyUserVideoRating,
+ getMyUserVideoQuotaUsed,
getUsersList,
getUsersListPaginationAndSort,
removeUser,
projects / oweals / peertube.git / commitdiff