Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add total videos by privacy for OTEL

Chocobozzza3bcaebc7394
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html
index 7052e140d9..e625e72ab6 100644
--- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html
+++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html
@@ -9,6 +9,7 @@
searchInput="true"
[inputFilters]="inputFilters"
refreshButton="true"
+ [hasExpandedRow]="hasExpandedRow"
>
<ng-template #totalTitle let-totalRecords>
<ng-container i18n>{ totalRecords, plural, =0 {No import} =1 {1 import} other {{{ totalRecords | myNumberFormatter }} imports}}</ng-container>
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts b/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
index dac64b5d9d..6d09673060 100644
--- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
+++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
@@ -70,9 +70,11 @@ export class MyVideoImportsComponent implements OnInit {
]
dataLoader: typeof this._dataLoader
+ hasExpandedRow: typeof this._hasExpandedRow
constructor () {
this.dataLoader = this._dataLoader.bind(this)
+ this.hasExpandedRow = this._hasExpandedRow.bind(this)
}
ngOnInit () {
@@ -188,4 +190,8 @@ export class MyVideoImportsComponent implements OnInit {
) {
return this.videoImportService.listMyVideoImports({ ...options, includeCollaborations: true })
}
+
+ private _hasExpandedRow (videoImport: VideoImport) {
+ return !!videoImport.error
+ }
}
diff --git a/server/core/lib/opentelemetry/metric-helpers/stats-observers-builder.ts b/server/core/lib/opentelemetry/metric-helpers/stats-observers-builder.ts
index ed411e94fa..7e82378837 100644
--- a/server/core/lib/opentelemetry/metric-helpers/stats-observers-builder.ts
+++ b/server/core/lib/opentelemetry/metric-helpers/stats-observers-builder.ts
@@ -1,8 +1,10 @@
import memoizee from 'memoizee'
import { Meter } from '@opentelemetry/api'
-import { MEMOIZE_TTL } from '@server/initializers/constants.js'
+import { MEMOIZE_TTL, VIDEO_PRIVACIES } from '@server/initializers/constants.js'
import { buildAvailableActivities } from '@server/lib/activitypub/activity.js'
import { StatsManager } from '@server/lib/stat-manager.js'
+import { VideoModel } from '@server/models/video/video.js'
+import { getAllPrivacies } from '@peertube/peertube-core-utils'
export class StatsObserversBuilder {
private readonly getInstanceStats = memoizee(() => {
@@ -69,7 +71,12 @@ export class StatsObserversBuilder {
}).addCallback(async observableResult => {
const stats = await this.getInstanceStats()
- observableResult.observe(stats.totalLocalVideos, { videoOrigin: 'local' })
+ for (const videoPrivacy of getAllPrivacies()) {
+ const total = await VideoModel.getTotalLocalVideosByPrivacy(videoPrivacy)
+
+ observableResult.observe(total, { videoOrigin: 'local', privacy: VIDEO_PRIVACIES[videoPrivacy] })
+ }
+
observableResult.observe(stats.totalVideos - stats.totalLocalVideos, { videoOrigin: 'remote' })
})
diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.ts
index c8c918a43a..e16557cceb 100644
--- a/server/core/models/video/video.ts
+++ b/server/core/models/video/video.ts
@@ -1503,6 +1503,8 @@ export class VideoModel extends SequelizeModel<VideoModel> {
return queryBuilder.queryVideo({ id, transaction, type: 'api', userId })
}
+ // ---------------------------------------------------------------------------
+
static async getStats () {
const serverActor = await getServerActor()
@@ -1533,14 +1535,10 @@ export class VideoModel extends SequelizeModel<VideoModel> {
}
}
- const { total: totalLocalVideos } = await VideoModel.listForApi({
- ...baseOptions,
-
- isLocal: true
- })
-
const { total: totalVideos } = await VideoModel.listForApi(baseOptions)
+ const totalLocalVideos = await VideoModel.getTotalLocalVideosByPrivacy(VideoPrivacy.PUBLIC)
+
return {
totalLocalVideos,
totalLocalVideoViews,
@@ -1549,6 +1547,22 @@ export class VideoModel extends SequelizeModel<VideoModel> {
}
}
+ static async getTotalLocalVideosByPrivacy (videoPrivacy: VideoPrivacyType) {
+ const { total } = await VideoModel.listForApi({
+ start: 0,
+ count: 0,
+ sort: '-publishedAt',
+ nsfw: null,
+ isLocal: true,
+ displayOnlyForFollower: null,
+ privacyOneOf: [ videoPrivacy ]
+ })
+
+ return total
+ }
+
+ // ---------------------------------------------------------------------------
+
static loadByNameAndChannel (channel: MChannelId, name: string): Promise<MVideo> {
return VideoModel.unscoped().findOne({
where: {