diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-06 17:13:39 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-08 09:30:31 +0200 |
commit | ce33919c24e7402d92d81f3cd8e545df52d98240 (patch) | |
tree | 7e131a2f8df649899d0a71294665cf386ffb50d4 /client/src/app/videos/+video-edit/video-add-components | |
parent | 788487140c500abeb69ca44daf3a9e26efa8d36f (diff) | |
download | PeerTube-ce33919c24e7402d92d81f3cd8e545df52d98240.tar.gz PeerTube-ce33919c24e7402d92d81f3cd8e545df52d98240.tar.zst PeerTube-ce33919c24e7402d92d81f3cd8e545df52d98240.zip |
Import magnets with webtorrent
Diffstat (limited to 'client/src/app/videos/+video-edit/video-add-components')
6 files changed, 232 insertions, 3 deletions
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html new file mode 100644 index 000000000..409e4de5e --- /dev/null +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html | |||
@@ -0,0 +1,60 @@ | |||
1 | <div *ngIf="!hasImportedVideo" class="upload-video-container"> | ||
2 | <div class="import-video-torrent"> | ||
3 | <div class="icon icon-upload"></div> | ||
4 | |||
5 | <div class="form-group"> | ||
6 | <label i18n for="magnetUri">Magnet URI</label> | ||
7 | <my-help | ||
8 | helpType="custom" i18n-customHtml | ||
9 | customHtml="You can import any torrent file that points to a mp4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance." | ||
10 | ></my-help> | ||
11 | |||
12 | <input type="text" id="magnetUri" [(ngModel)]="magnetUri" /> | ||
13 | </div> | ||
14 | |||
15 | <div class="form-group"> | ||
16 | <label i18n for="first-step-channel">Channel</label> | ||
17 | <div class="peertube-select-container"> | ||
18 | <select id="first-step-channel" [(ngModel)]="firstStepChannelId"> | ||
19 | <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option> | ||
20 | </select> | ||
21 | </div> | ||
22 | </div> | ||
23 | |||
24 | <div class="form-group"> | ||
25 | <label i18n for="first-step-privacy">Privacy</label> | ||
26 | <div class="peertube-select-container"> | ||
27 | <select id="first-step-privacy" [(ngModel)]="firstStepPrivacyId"> | ||
28 | <option *ngFor="let privacy of videoPrivacies" [value]="privacy.id">{{ privacy.label }}</option> | ||
29 | </select> | ||
30 | </div> | ||
31 | </div> | ||
32 | |||
33 | <input | ||
34 | type="button" i18n-value value="Import" | ||
35 | [disabled]="!isMagnetUrlValid() || isImportingVideo" (click)="importVideo()" | ||
36 | /> | ||
37 | </div> | ||
38 | </div> | ||
39 | |||
40 | <div *ngIf="hasImportedVideo" class="alert alert-info" i18n> | ||
41 | Congratulations, the video will be imported with BitTorrent! You can already add information about this video. | ||
42 | </div> | ||
43 | |||
44 | <!-- Hidden because we want to load the component --> | ||
45 | <form [hidden]="!hasImportedVideo" novalidate [formGroup]="form"> | ||
46 | <my-video-edit | ||
47 | [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions" [schedulePublicationPossible]="false" | ||
48 | [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels" | ||
49 | ></my-video-edit> | ||
50 | |||
51 | <div class="submit-container"> | ||
52 | <div class="submit-button" | ||
53 | (click)="updateSecondStep()" | ||
54 | [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" | ||
55 | > | ||
56 | <span class="icon icon-validate"></span> | ||
57 | <input type="button" i18n-value value="Update" /> | ||
58 | </div> | ||
59 | </div> | ||
60 | </form> | ||
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss new file mode 100644 index 000000000..1ef5adc25 --- /dev/null +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss | |||
@@ -0,0 +1,37 @@ | |||
1 | @import 'variables'; | ||
2 | @import 'mixins'; | ||
3 | |||
4 | $width-size: 190px; | ||
5 | |||
6 | .peertube-select-container { | ||
7 | @include peertube-select-container($width-size); | ||
8 | } | ||
9 | |||
10 | .import-video-torrent { | ||
11 | display: flex; | ||
12 | flex-direction: column; | ||
13 | align-items: center; | ||
14 | |||
15 | .icon.icon-upload { | ||
16 | @include icon(90px); | ||
17 | margin-bottom: 25px; | ||
18 | cursor: default; | ||
19 | |||
20 | background-image: url('../../../../assets/images/video/upload.svg'); | ||
21 | } | ||
22 | |||
23 | input[type=text] { | ||
24 | @include peertube-input-text($width-size); | ||
25 | display: block; | ||
26 | } | ||
27 | |||
28 | input[type=button] { | ||
29 | @include peertube-button; | ||
30 | @include orange-button; | ||
31 | |||
32 | width: $width-size; | ||
33 | margin-top: 30px; | ||
34 | } | ||
35 | } | ||
36 | |||
37 | |||
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts new file mode 100644 index 000000000..330c37718 --- /dev/null +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts | |||
@@ -0,0 +1,132 @@ | |||
1 | import { Component, EventEmitter, OnInit, Output } from '@angular/core' | ||
2 | import { Router } from '@angular/router' | ||
3 | import { NotificationsService } from 'angular2-notifications' | ||
4 | import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos' | ||
5 | import { AuthService, ServerService } from '../../../core' | ||
6 | import { VideoService } from '../../../shared/video/video.service' | ||
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
8 | import { LoadingBarService } from '@ngx-loading-bar/core' | ||
9 | import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send' | ||
10 | import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' | ||
11 | import { VideoEdit } from '@app/shared/video/video-edit.model' | ||
12 | import { FormValidatorService } from '@app/shared' | ||
13 | import { VideoCaptionService } from '@app/shared/video-caption' | ||
14 | import { VideoImportService } from '@app/shared/video-import' | ||
15 | |||
16 | @Component({ | ||
17 | selector: 'my-video-import-torrent', | ||
18 | templateUrl: './video-import-torrent.component.html', | ||
19 | styleUrls: [ | ||
20 | '../shared/video-edit.component.scss', | ||
21 | './video-import-torrent.component.scss' | ||
22 | ] | ||
23 | }) | ||
24 | export class VideoImportTorrentComponent extends VideoSend implements OnInit, CanComponentDeactivate { | ||
25 | @Output() firstStepDone = new EventEmitter<string>() | ||
26 | |||
27 | videoFileName: string | ||
28 | magnetUri = '' | ||
29 | |||
30 | isImportingVideo = false | ||
31 | hasImportedVideo = false | ||
32 | isUpdatingVideo = false | ||
33 | |||
34 | video: VideoEdit | ||
35 | |||
36 | protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PRIVATE | ||
37 | |||
38 | constructor ( | ||
39 | protected formValidatorService: FormValidatorService, | ||
40 | protected loadingBar: LoadingBarService, | ||
41 | protected notificationsService: NotificationsService, | ||
42 | protected authService: AuthService, | ||
43 | protected serverService: ServerService, | ||
44 | protected videoService: VideoService, | ||
45 | protected videoCaptionService: VideoCaptionService, | ||
46 | private router: Router, | ||
47 | private videoImportService: VideoImportService, | ||
48 | private i18n: I18n | ||
49 | ) { | ||
50 | super() | ||
51 | } | ||
52 | |||
53 | ngOnInit () { | ||
54 | super.ngOnInit() | ||
55 | } | ||
56 | |||
57 | canDeactivate () { | ||
58 | return { canDeactivate: true } | ||
59 | } | ||
60 | |||
61 | isMagnetUrlValid () { | ||
62 | return !!this.magnetUri | ||
63 | } | ||
64 | |||
65 | importVideo () { | ||
66 | this.isImportingVideo = true | ||
67 | |||
68 | const videoUpdate: VideoUpdate = { | ||
69 | privacy: this.firstStepPrivacyId, | ||
70 | waitTranscoding: false, | ||
71 | commentsEnabled: true, | ||
72 | channelId: this.firstStepChannelId | ||
73 | } | ||
74 | |||
75 | this.loadingBar.start() | ||
76 | |||
77 | this.videoImportService.importVideoTorrent(this.magnetUri, videoUpdate).subscribe( | ||
78 | res => { | ||
79 | this.loadingBar.complete() | ||
80 | this.firstStepDone.emit(res.video.name) | ||
81 | this.isImportingVideo = false | ||
82 | this.hasImportedVideo = true | ||
83 | |||
84 | this.video = new VideoEdit(Object.assign(res.video, { | ||
85 | commentsEnabled: videoUpdate.commentsEnabled, | ||
86 | support: null, | ||
87 | thumbnailUrl: null, | ||
88 | previewUrl: null | ||
89 | })) | ||
90 | this.hydrateFormFromVideo() | ||
91 | }, | ||
92 | |||
93 | err => { | ||
94 | this.loadingBar.complete() | ||
95 | this.isImportingVideo = false | ||
96 | this.notificationsService.error(this.i18n('Error'), err.message) | ||
97 | } | ||
98 | ) | ||
99 | } | ||
100 | |||
101 | updateSecondStep () { | ||
102 | if (this.checkForm() === false) { | ||
103 | return | ||
104 | } | ||
105 | |||
106 | this.video.patch(this.form.value) | ||
107 | |||
108 | this.isUpdatingVideo = true | ||
109 | |||
110 | // Update the video | ||
111 | this.updateVideoAndCaptions(this.video) | ||
112 | .subscribe( | ||
113 | () => { | ||
114 | this.isUpdatingVideo = false | ||
115 | this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.')) | ||
116 | |||
117 | this.router.navigate([ '/my-account', 'video-imports' ]) | ||
118 | }, | ||
119 | |||
120 | err => { | ||
121 | this.isUpdatingVideo = false | ||
122 | this.notificationsService.error(this.i18n('Error'), err.message) | ||
123 | console.error(err) | ||
124 | } | ||
125 | ) | ||
126 | |||
127 | } | ||
128 | |||
129 | private hydrateFormFromVideo () { | ||
130 | this.form.patchValue(this.video.toFormPatch()) | ||
131 | } | ||
132 | } | ||
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html index 6b431f6f6..9f5fc6d22 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <div *ngIf="!hasImportedVideo" class="upload-video-container"> | 1 | <div *ngIf="!hasImportedVideo" class="upload-video-container"> |
2 | <div class="import-video"> | 2 | <div class="import-video-url"> |
3 | <div class="icon icon-upload"></div> | 3 | <div class="icon icon-upload"></div> |
4 | 4 | ||
5 | <div class="form-group"> | 5 | <div class="form-group"> |
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss index 5e713ab97..7c6deda1d 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss | |||
@@ -7,7 +7,7 @@ $width-size: 190px; | |||
7 | @include peertube-select-container($width-size); | 7 | @include peertube-select-container($width-size); |
8 | } | 8 | } |
9 | 9 | ||
10 | .import-video { | 10 | .import-video-url { |
11 | display: flex; | 11 | display: flex; |
12 | flex-direction: column; | 12 | flex-direction: column; |
13 | align-items: center; | 13 | align-items: center; |
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts index dbe69409f..842ede732 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts | |||
@@ -74,7 +74,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom | |||
74 | 74 | ||
75 | this.loadingBar.start() | 75 | this.loadingBar.start() |
76 | 76 | ||
77 | this.videoImportService.importVideo(this.targetUrl, videoUpdate).subscribe( | 77 | this.videoImportService.importVideoUrl(this.targetUrl, videoUpdate).subscribe( |
78 | res => { | 78 | res => { |
79 | this.loadingBar.complete() | 79 | this.loadingBar.complete() |
80 | this.firstStepDone.emit(res.video.name) | 80 | this.firstStepDone.emit(res.video.name) |