TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-10 17:31:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where subs would only display 10 of their videos in the subscription component (#851)

Browse Source 
Fixed an issue where a sub would get stuck in the downloading state

Fixed UI bug in the subscriptions component
This commit is contained in:
Tzahi12345
2023-04-01 18:59:23 -04:00
parent 9f833d32a2
commit 1f2c5a0238
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/subscriptions.js
View File

@@ -432,7 +432,8 @@ async function getAllSubscriptions() {
} }
async function getSubscription(subID) { async function getSubscription(subID) {
const sub = await db_api.getRecord('subscriptions', {id: subID}); // stringify and parse because we may override the 'downloading' property
const sub = JSON.parse(JSON.stringify(await db_api.getRecord('subscriptions', {id: subID})));
// now with the download_queue, we may need to override 'downloading' // now with the download_queue, we may need to override 'downloading'
const current_downloads = await db_api.getRecords('download_queue', {running: true, sub_id: sub.id}, true); const current_downloads = await db_api.getRecords('download_queue', {running: true, sub_id: sub.id}, true);
if (!sub['downloading']) sub['downloading'] = current_downloads > 0; if (!sub['downloading']) sub['downloading'] = current_downloads > 0;

2
src/app/components/recent-videos/recent-videos.component.ts
View File

@@ -215,7 +215,7 @@ export class RecentVideosComponent implements OnInit {
const range = [current_file_index, current_file_index + this.pageSize]; const range = [current_file_index, current_file_index + this.pageSize];
const fileTypeFilter = this.getFileTypeFilter(); const fileTypeFilter = this.getFileTypeFilter();
const favoriteFilter = this.getFavoriteFilter(); const favoriteFilter = this.getFavoriteFilter();
this.postsService.getAllFiles(sort, range, this.search_mode ? this.search_text : null, fileTypeFilter as FileTypeFilter, favoriteFilter, this.sub_id).subscribe(res => { this.postsService.getAllFiles(sort, this.usePaginator ? range : null, this.search_mode ? this.search_text : null, fileTypeFilter as FileTypeFilter, favoriteFilter, this.sub_id).subscribe(res => {
this.file_count = res['file_count']; this.file_count = res['file_count'];
this.paged_data = res['files']; this.paged_data = res['files'];
for (let i = 0; i < this.paged_data.length; i++) { for (let i = 0; i < this.paged_data.length; i++) {

5
src/app/subscription/subscription/subscription.component.html
View File

@@ -9,8 +9,9 @@
<mat-divider style="width: 80%; margin: 0 auto"></mat-divider> <mat-divider style="width: 80%; margin: 0 auto"></mat-divider>
<br/> <br/>
<div *ngIf="subscription"> <!-- Extra margin added for floating buttons to have room -->
<app-recent-videos #recentVideos [sub_id]="subscription.id" [usePaginator]="false"></app-recent-videos> <div style="margin-bottom: 100px;" *ngIf="subscription">
<app-recent-videos #recentVideos [sub_id]="subscription.id"></app-recent-videos>
</div> </div>
<button class="edit-button" color="primary" (click)="editSubscription()" [disabled]="downloading" matTooltip="Edit" i18n-matTooltip="Edit" mat-fab><mat-icon class="save-icon">edit</mat-icon></button> <button class="edit-button" color="primary" (click)="editSubscription()" [disabled]="downloading" matTooltip="Edit" i18n-matTooltip="Edit" mat-fab><mat-icon class="save-icon">edit</mat-icon></button>
<button class="watch-button" color="primary" (click)="watchSubscription()" matTooltip="Play all" i18n-matTooltip="Play all" mat-fab><mat-icon class="save-icon">video_library</mat-icon></button> <button class="watch-button" color="primary" (click)="watchSubscription()" matTooltip="Play all" i18n-matTooltip="Play all" mat-fab><mat-icon class="save-icon">video_library</mat-icon></button>

3
src/app/subscription/subscription/subscription.component.scss
View File

@@ -62,15 +62,18 @@
left: 25px; left: 25px;
position: fixed; position: fixed;
bottom: 25px; bottom: 25px;
z-index: 99999;
} }
.save-icon { .save-icon {
bottom: 1px; bottom: 1px;
position: relative; position: relative;
z-index: 99999;
} }
.watch-button { .watch-button {
left: 90px; left: 90px;
position: fixed; position: fixed;
bottom: 25px; bottom: 25px;
z-index: 99999;
} }