File deletion is now unified between sub and non-sub files

This commit is contained in:
Tzahi12345
2023-01-13 22:24:16 -05:00
parent 8bc14a8be8
commit fe06076eba
8 changed files with 22 additions and 40 deletions

View File

@@ -2,12 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import type { SubscriptionRequestData } from './SubscriptionRequestData';
export type DeleteSubscriptionFileRequest = {
file: string;
file_uid?: string;
sub: SubscriptionRequestData;
file_uid: string;
/**
* If true, does not remove id from archive. Only valid if youtube-dl archive is enabled in settings.
*/

View File

@@ -316,16 +316,14 @@ export class RecentVideosComponent implements OnInit {
}
deleteAndRedownload(file: DatabaseFile): void {
const sub = this.postsService.getSubscriptionByID(file.sub_id);
this.postsService.deleteSubscriptionFile(sub, file.id, false, file.uid).subscribe(() => {
this.postsService.deleteSubscriptionFile(file.uid, false).subscribe(() => {
this.postsService.openSnackBar($localize`Successfully deleted file: ` + file.id);
this.removeFileCard(file);
});
}
deleteForever(file: DatabaseFile): void {
const sub = this.postsService.getSubscriptionByID(file.sub_id);
this.postsService.deleteSubscriptionFile(sub, file.id, true, file.uid).subscribe(() => {
this.postsService.deleteSubscriptionFile(file.uid, true).subscribe(() => {
this.postsService.openSnackBar($localize`Successfully deleted file: ` + file.id);
this.removeFileCard(file);
});

View File

@@ -552,9 +552,8 @@ export class PostsService implements CanActivate {
return this.http.post<UnsubscribeResponse>(this.path + 'unsubscribe', body, this.httpOptions)
}
deleteSubscriptionFile(sub: SubscriptionRequestData, file: string, deleteForever: boolean, file_uid: string) {
const body: DeleteSubscriptionFileRequest = {sub: sub, file: file, deleteForever: deleteForever,
file_uid: file_uid};
deleteSubscriptionFile(file_uid: string, deleteForever: boolean) {
const body: DeleteSubscriptionFileRequest = {file_uid: file_uid, deleteForever: deleteForever};
return this.http.post<SuccessObject>(this.path + 'deleteSubscriptionFile', body, this.httpOptions)
}