a1a6333f09
* Fixed a bug which didn't take sort direction when not changing sort field * Added foundation for Bookmark refactor * Code broken, need to take a break. Issue is Getting bookmark image needs authentication but UI doesn't send. * Implemented the ability to send bookmarked files to the web. Implemented ability to clear bookmarks on disk on a re-occuring basis. * Updated the bookmark design to have it's own card that is self contained. View bookmarks modal has been updated to better lay out the cards. * Refactored download bookmark codes to select files from bookmark directory directly rather than open underlying files. * Wrote the basic logic to kick start the bookmark migration. Added Installed Version into the DB to allow us to know more accurately when to run migrations * Implemented the ability to change the bookmarks directory * Updated all references to BookmarkDirectory to use setting from the DB. Updated Server Settings page to use 2 col for some rows. * Refactored some code to DirectoryService (hasWriteAccess) and fixed up some unit tests from a previous PR. * Treat folders that start with ._ as blacklisted. * Implemented Reset User preferences. Some extra code to prep for the migration. * Implemented a migration for existing bookmarks to using new filesystem based bookmarks
80 lines
2.6 KiB
TypeScript
80 lines
2.6 KiB
TypeScript
import { Injectable, OnDestroy } from '@angular/core';
|
|
import { Subject } from 'rxjs';
|
|
import { takeUntil } from 'rxjs/operators';
|
|
import { environment } from 'src/environments/environment';
|
|
import { AccountService } from './account.service';
|
|
import { NavService } from './nav.service';
|
|
|
|
@Injectable({
|
|
providedIn: 'root'
|
|
})
|
|
export class ImageService implements OnDestroy {
|
|
|
|
baseUrl = environment.apiUrl;
|
|
apiKey: string = '';
|
|
public placeholderImage = 'assets/images/image-placeholder-min.png';
|
|
public errorImage = 'assets/images/error-placeholder2-min.png';
|
|
public resetCoverImage = 'assets/images/image-reset-cover-min.png';
|
|
|
|
private onDestroy: Subject<void> = new Subject();
|
|
|
|
constructor(private navSerivce: NavService, private accountService: AccountService) {
|
|
this.navSerivce.darkMode$.subscribe(res => {
|
|
if (res) {
|
|
this.placeholderImage = 'assets/images/image-placeholder.dark-min.png';
|
|
this.errorImage = 'assets/images/error-placeholder2.dark-min.png';
|
|
} else {
|
|
this.placeholderImage = 'assets/images/image-placeholder-min.png';
|
|
this.errorImage = 'assets/images/error-placeholder2-min.png';
|
|
}
|
|
});
|
|
|
|
this.accountService.currentUser$.pipe(takeUntil(this.onDestroy)).subscribe(user => {
|
|
if (user) {
|
|
this.apiKey = user.apiKey;
|
|
}
|
|
});
|
|
}
|
|
|
|
ngOnDestroy(): void {
|
|
this.onDestroy.next();
|
|
this.onDestroy.complete();
|
|
}
|
|
|
|
getVolumeCoverImage(volumeId: number) {
|
|
return this.baseUrl + 'image/volume-cover?volumeId=' + volumeId;
|
|
}
|
|
|
|
getSeriesCoverImage(seriesId: number) {
|
|
return this.baseUrl + 'image/series-cover?seriesId=' + seriesId;
|
|
}
|
|
|
|
getCollectionCoverImage(collectionTagId: number) {
|
|
return this.baseUrl + 'image/collection-cover?collectionTagId=' + collectionTagId;
|
|
}
|
|
|
|
getChapterCoverImage(chapterId: number) {
|
|
return this.baseUrl + 'image/chapter-cover?chapterId=' + chapterId;
|
|
}
|
|
|
|
getBookmarkedImage(chapterId: number, pageNum: number) {
|
|
return this.baseUrl + 'image/bookmark?chapterId=' + chapterId + '&pageNum=' + pageNum + '&apiKey=' + encodeURIComponent(this.apiKey);
|
|
}
|
|
|
|
updateErroredImage(event: any) {
|
|
event.target.src = this.placeholderImage;
|
|
}
|
|
|
|
/**
|
|
* Used to refresh an existing loaded image (lazysizes). If random already attached, will append another number onto it.
|
|
* @param url Existing request url from ImageService only
|
|
* @returns Url with a random parameter attached
|
|
*/
|
|
randomize(url: string) {
|
|
const r = Math.random() * 100 + 1;
|
|
if (url.indexOf('&random') >= 0) {
|
|
return url + 1;
|
|
}
|
|
return url + '&random=' + r;
|
|
}
|
|
}
|