Use global uuid instead of remoteId for videos

8 files changed, 27 insertions, 24 deletions

diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts
index f5e16fc13..9ed6a0641 100644
--- a/client/src/app/videos/shared/video.model.ts
+++ b/client/src/app/videos/shared/video.model.ts
@@ -14,7 +14,8 @@ export class Video implements VideoServerModel {
   description: string
   duration: number
   durationLabel: string
-  id: string
+  id: number
+  uuid: string
   isLocal: boolean
   magnetUri: string
   name: string
@@ -51,7 +52,8 @@ export class Video implements VideoServerModel {
     language: number
     description: string,
     duration: number
-    id: string,
+    id: number,
+    uuid: string,
     isLocal: boolean,
     magnetUri: string,
     name: string,
@@ -75,6 +77,7 @@ export class Video implements VideoServerModel {
     this.duration = hash.duration
     this.durationLabel = Video.createDurationString(hash.duration)
     this.id = hash.id
+    this.uuid = hash.uuid
     this.isLocal = hash.isLocal
     this.magnetUri = hash.magnetUri
     this.name = hash.name
diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts
index dc12c0637..67091a8d8 100644
--- a/client/src/app/videos/shared/video.service.ts
+++ b/client/src/app/videos/shared/video.service.ts
@@ -52,8 +52,8 @@ export class VideoService {
     return this.loadVideoAttributeEnum('languages', this.videoLanguages)
   }
 
-  getVideo (id: string): Observable<Video> {
-    return this.http.get(VideoService.BASE_VIDEO_URL + id)
+  getVideo (uuid: string): Observable<Video> {
+    return this.http.get(VideoService.BASE_VIDEO_URL + uuid)
                     .map(this.restExtractor.extractDataGet)
                     .map(videoHash => new Video(videoHash))
                     .catch((res) => this.restExtractor.handleError(res))
@@ -89,7 +89,7 @@ export class VideoService {
                     .catch((res) => this.restExtractor.handleError(res))
   }
 
-  removeVideo (id: string) {
+  removeVideo (id: number) {
     return this.authHttp.delete(VideoService.BASE_VIDEO_URL + id)
                         .map(this.restExtractor.extractDataBool)
                         .catch((res) => this.restExtractor.handleError(res))
@@ -106,7 +106,7 @@ export class VideoService {
                     .catch((res) => this.restExtractor.handleError(res))
   }
 
-  reportVideo (id: string, reason: string) {
+  reportVideo (id: number, reason: string) {
     const url = VideoService.BASE_VIDEO_URL + id + '/abuse'
     const body: VideoAbuseCreate = {
       reason
@@ -117,15 +117,15 @@ export class VideoService {
                         .catch((res) => this.restExtractor.handleError(res))
   }
 
-  setVideoLike (id: string) {
+  setVideoLike (id: number) {
     return this.setVideoRate(id, 'like')
   }
 
-  setVideoDislike (id: string) {
+  setVideoDislike (id: number) {
     return this.setVideoRate(id, 'dislike')
   }
 
-  getUserVideoRating (id: string): Observable<UserVideoRate> {
+  getUserVideoRating (id: number): Observable<UserVideoRate> {
     const url = UserService.BASE_USERS_URL + '/me/videos/' + id + '/rating'
 
     return this.authHttp.get(url)
@@ -133,13 +133,13 @@ export class VideoService {
                         .catch((res) => this.restExtractor.handleError(res))
   }
 
-  blacklistVideo (id: string) {
+  blacklistVideo (id: number) {
     return this.authHttp.post(VideoService.BASE_VIDEO_URL + id + '/blacklist', {})
                         .map(this.restExtractor.extractDataBool)
                         .catch((res) => this.restExtractor.handleError(res))
   }
 
-  private setVideoRate (id: string, rateType: VideoRateType) {
+  private setVideoRate (id: number, rateType: VideoRateType) {
     const url = VideoService.BASE_VIDEO_URL + id + '/rate'
     const body: UserVideoRateUpdate = {
       rating: rateType
diff --git a/client/src/app/videos/video-edit/video-update.component.ts b/client/src/app/videos/video-edit/video-update.component.ts
index 9ee7ca6a8..6c57a23d8 100644
--- a/client/src/app/videos/video-edit/video-update.component.ts
+++ b/client/src/app/videos/video-edit/video-update.component.ts
@@ -85,8 +85,8 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     this.videoLicences = this.videoService.videoLicences
     this.videoLanguages = this.videoService.videoLanguages
 
-    const id = this.route.snapshot.params['id']
-    this.videoService.getVideo(id)
+    const uuid: string = this.route.snapshot.params['uuid']
+    this.videoService.getVideo(uuid)
                      .subscribe(
                        video => {
                          this.video = video
@@ -118,7 +118,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
                      .subscribe(
                        () => {
                          this.notificationsService.success('Success', 'Video updated.')
-                         this.router.navigate([ '/videos/watch', this.video.id ])
+                         this.router.navigate([ '/videos/watch', this.video.uuid ])
                        },
 
                        err => {
diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html
index db6c4d6fb..6525b67bf 100644
--- a/client/src/app/videos/video-list/video-miniature.component.html
+++ b/client/src/app/videos/video-list/video-miniature.component.html
@@ -1,6 +1,6 @@
 <div class="video-miniature">
   <a
-    [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description"
+    [routerLink]="['/videos/watch', video.uuid]" [attr.title]="video.description"
     class="video-miniature-thumbnail"
   >
     <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailUrl" alt="video thumbnail" />
@@ -16,7 +16,7 @@
 
   <div class="video-miniature-informations">
     <span class="video-miniature-name">
-      <a [routerLink]="['/videos/watch', video.id]" [attr.title]="getVideoName()" class="video-miniature-name">{{ getVideoName() }}</a>
+      <a [routerLink]="['/videos/watch', video.uuid]" [attr.title]="getVideoName()" class="video-miniature-name">{{ getVideoName() }}</a>
     </span>
 
     <div class="video-miniature-tags">
diff --git a/client/src/app/videos/video-watch/video-share.component.ts b/client/src/app/videos/video-watch/video-share.component.ts
index bbd25f5ef..133f93498 100644
--- a/client/src/app/videos/video-watch/video-share.component.ts
+++ b/client/src/app/videos/video-watch/video-share.component.ts
@@ -27,7 +27,7 @@ export class VideoShareComponent {
 
   getVideoIframeCode () {
     return '<iframe width="560" height="315" ' +
-           'src="' + window.location.origin + '/videos/embed/' + this.video.id + '" ' +
+           'src="' + window.location.origin + '/videos/embed/' + this.video.uuid + '" ' +
            'frameborder="0" allowfullscreen>' +
            '</iframe>'
   }
diff --git a/client/src/app/videos/video-watch/video-watch.component.html b/client/src/app/videos/video-watch/video-watch.component.html
index 8676b5b72..88863131a 100644
--- a/client/src/app/videos/video-watch/video-watch.component.html
+++ b/client/src/app/videos/video-watch/video-watch.component.html
@@ -65,7 +65,7 @@
 
         <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
           <li *ngIf="canUserUpdateVideo()" role="menuitem">
-            <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.id ]">
+            <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.uuid ]">
               <span class="glyphicon glyphicon-pencil"></span> Update
             </a>
           </li>
diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts
index 6bd6c1f7e..104ba0db6 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -58,8 +58,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
   ngOnInit () {
     this.paramsSub = this.route.params.subscribe(routeParams => {
-      let id = routeParams['id']
-      this.videoService.getVideo(id).subscribe(
+      let uuid = routeParams['uuid']
+      this.videoService.getVideo(uuid).subscribe(
         video => this.onVideoFetched(video),
 
         error => {
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts
index e18c1cec0..715671ba7 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/videos/videos-routing.module.ts
@@ -33,7 +33,7 @@ const videosRoutes: Routes = [
         }
       },
       {
-        path: 'edit/:id',
+        path: 'edit/:uuid',
         component: VideoUpdateComponent,
         data: {
           meta: {
@@ -42,11 +42,11 @@ const videosRoutes: Routes = [
         }
       },
       {
-        path: ':id',
-        redirectTo: 'watch/:id'
+        path: ':uuid',
+        redirectTo: 'watch/:uuid'
       },
       {
-        path: 'watch/:id',
+        path: 'watch/:uuid',
         component: VideoWatchComponent
       }
     ]