-import { ElementRef, OnInit, ViewChild, ViewChildren } from '@angular/core'
+import { debounceTime } from 'rxjs/operators'
+import { ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
+import { Location } from '@angular/common'
import { isInMobileView } from '@app/shared/misc/utils'
import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive'
import { NotificationsService } from 'angular2-notifications'
-import { Observable } from 'rxjs/Observable'
+import { fromEvent, Observable, Subscription } from 'rxjs'
import { AuthService } from '../../core/auth'
import { ComponentPagination } from '../rest/component-pagination.model'
-import { SortField } from './sort-field.type'
+import { VideoSortField } from './sort-field.type'
import { Video } from './video.model'
+import { I18n } from '@ngx-translate/i18n-polyfill'
-export abstract class AbstractVideoList implements OnInit {
- private static LINES_PER_PAGE = 3
+export abstract class AbstractVideoList implements OnInit, OnDestroy {
+ private static LINES_PER_PAGE = 4
- @ViewChild('videoElement') videosElement: ElementRef
+ @ViewChild('videosElement') videosElement: ElementRef
@ViewChild(InfiniteScrollerDirective) infiniteScroller: InfiniteScrollerDirective
pagination: ComponentPagination = {
itemsPerPage: 10,
totalItems: null
}
- sort: SortField = '-createdAt'
- defaultSort: SortField = '-createdAt'
+ sort: VideoSortField = '-publishedAt'
+ defaultSort: VideoSortField = '-publishedAt'
+ syndicationItems = []
+
loadOnInit = true
+ marginContent = true
pageHeight: number
- videoWidth = 215
- videoHeight = 230
- videoPages: Video[][]
+ videoWidth: number
+ videoHeight: number
+ videoPages: Video[][] = []
+
+ protected baseVideoWidth = 215
+ protected baseVideoHeight = 230
protected abstract notificationsService: NotificationsService
protected abstract authService: AuthService
protected abstract router: Router
protected abstract route: ActivatedRoute
+ protected abstract i18n: I18n
+ protected abstract location: Location
protected abstract currentRoute: string
abstract titlePage: string
protected loadedPages: { [ id: number ]: Video[] } = {}
+ protected loadingPage: { [ id: number ]: boolean } = {}
protected otherRouteParams = {}
+ private resizeSubscription: Subscription
+
abstract getVideosObservable (page: number): Observable<{ videos: Video[], totalVideos: number}>
+ abstract generateSyndicationList ()
get user () {
return this.authService.getUser()
ngOnInit () {
// Subscribe to route changes
- const routeParams = this.route.snapshot.params
+ const routeParams = this.route.snapshot.queryParams
this.loadRouteParams(routeParams)
- if (isInMobileView()) {
- this.pagination.itemsPerPage = 5
- this.videoWidth = -1
- }
-
- if (this.videoWidth !== -1) {
- const videosWidth = this.videosElement.nativeElement.offsetWidth
- this.pagination.itemsPerPage = Math.floor(videosWidth / this.videoWidth) * AbstractVideoList.LINES_PER_PAGE
- }
-
- // Video takes all the width
- if (this.videoWidth === -1) {
- this.pageHeight = this.pagination.itemsPerPage * this.videoHeight
- } else {
- this.pageHeight = this.videoHeight * AbstractVideoList.LINES_PER_PAGE
- }
+ this.resizeSubscription = fromEvent(window, 'resize')
+ .pipe(debounceTime(500))
+ .subscribe(() => this.calcPageSizes())
+ this.calcPageSizes()
if (this.loadOnInit === true) this.loadMoreVideos(this.pagination.currentPage)
}
+ ngOnDestroy () {
+ if (this.resizeSubscription) this.resizeSubscription.unsubscribe()
+ }
+
onNearOfTop () {
this.previousPage()
}
loadMoreVideos (page: number) {
if (this.loadedPages[page] !== undefined) return
+ if (this.loadingPage[page] === true) return
+ this.loadingPage[page] = true
const observable = this.getVideosObservable(page)
observable.subscribe(
({ videos, totalVideos }) => {
+ this.loadingPage[page] = false
+
// Paging is too high, return to the first one
if (this.pagination.currentPage > 1 && totalVideos <= ((this.pagination.currentPage - 1) * this.pagination.itemsPerPage)) {
this.pagination.currentPage = 1
setTimeout(() => this.infiniteScroller.initialize(), 500)
}
},
- error => this.notificationsService.error('Error', error.message)
+ error => {
+ this.loadingPage[page] = false
+ this.notificationsService.error(this.i18n('Error'), error.message)
+ }
)
}
if (!this.pagination.totalItems) return true
const maxPage = this.pagination.totalItems / this.pagination.itemsPerPage
- return maxPage > this.pagination.currentPage
+ return maxPage > this.maxPageLoaded()
}
protected previousPage () {
}
protected loadRouteParams (routeParams: { [ key: string ]: any }) {
- this.sort = routeParams['sort'] as SortField || this.defaultSort
+ this.sort = routeParams['sort'] as VideoSortField || this.defaultSort
if (routeParams['page'] !== undefined) {
this.pagination.currentPage = parseInt(routeParams['page'], 10)
}
protected setNewRouteParams () {
- const routeParams = this.buildRouteParams()
- this.router.navigate([ this.currentRoute, routeParams ])
+ const paramsObject = this.buildRouteParams()
+
+ const queryParams = Object.keys(paramsObject).map(p => p + '=' + paramsObject[p]).join('&')
+ this.location.replaceState(this.currentRoute, queryParams)
}
protected buildVideoPages () {
this.videoPages = Object.values(this.loadedPages)
}
+ protected buildVideoHeight () {
+ // Same ratios than base width/height
+ return this.videosElement.nativeElement.offsetWidth * (this.baseVideoHeight / this.baseVideoWidth)
+ }
+
private minPageLoaded () {
return Math.min(...Object.keys(this.loadedPages).map(e => parseInt(e, 10)))
}
private maxPageLoaded () {
return Math.max(...Object.keys(this.loadedPages).map(e => parseInt(e, 10)))
}
+
+ private calcPageSizes () {
+ if (isInMobileView() || this.baseVideoWidth === -1) {
+ this.pagination.itemsPerPage = 5
+
+ // Video takes all the width
+ this.videoWidth = -1
+ this.videoHeight = this.buildVideoHeight()
+ this.pageHeight = this.pagination.itemsPerPage * this.videoHeight
+ } else {
+ this.videoWidth = this.baseVideoWidth
+ this.videoHeight = this.baseVideoHeight
+
+ const videosWidth = this.videosElement.nativeElement.offsetWidth
+ this.pagination.itemsPerPage = Math.floor(videosWidth / this.videoWidth) * AbstractVideoList.LINES_PER_PAGE
+ this.pageHeight = this.videoHeight * AbstractVideoList.LINES_PER_PAGE
+ }
+
+ // Rebuild pages because maybe we modified the number of items per page
+ const videos = [].concat(...this.videoPages)
+ this.loadedPages = {}
+
+ let i = 1
+ // Don't include the last page if it not complete
+ while (videos.length >= this.pagination.itemsPerPage && i < 10000) { // 10000 -> Hard limit in case of infinite loop
+ this.loadedPages[i] = videos.splice(0, this.pagination.itemsPerPage)
+ i++
+ }
+
+ // Re fetch the last page
+ if (videos.length !== 0) {
+ this.loadMoreVideos(i)
+ } else {
+ this.buildVideoPages()
+ }
+
+ console.log('Rebuilt pages with %s elements per page.', this.pagination.itemsPerPage)
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff