Skip to content

Commit

Permalink
fix: handle Plex library settings migration failure gracefully (#2254)
Browse files Browse the repository at this point in the history
* fix: handle Plex library settings migration failure gracefully

* fix: handle failure in syncLibraries() instead
  • Loading branch information
TheCatLady committed Dec 4, 2021
1 parent c9ffac3 commit ed53810
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 23 deletions.
53 changes: 33 additions & 20 deletions server/api/plexapi.ts
@@ -1,5 +1,6 @@
import NodePlexAPI from 'plex-api';
import { getSettings, Library, PlexSettings } from '../lib/settings';
import logger from '../logger';

export interface PlexLibraryItem {
ratingKey: string;
Expand Down Expand Up @@ -145,28 +146,40 @@ class PlexAPI {
public async syncLibraries(): Promise<void> {
const settings = getSettings();

const libraries = await this.getLibraries();

const newLibraries: Library[] = libraries
// Remove libraries that are not movie or show
.filter((library) => library.type === 'movie' || library.type === 'show')
// Remove libraries that do not have a metadata agent set (usually personal video libraries)
.filter((library) => library.agent !== 'com.plexapp.agents.none')
.map((library) => {
const existing = settings.plex.libraries.find(
(l) => l.id === library.key && l.name === library.title
);

return {
id: library.key,
name: library.title,
enabled: existing?.enabled ?? false,
type: library.type,
lastScan: existing?.lastScan,
};
try {
const libraries = await this.getLibraries();

const newLibraries: Library[] = libraries
// Remove libraries that are not movie or show
.filter(
(library) => library.type === 'movie' || library.type === 'show'
)
// Remove libraries that do not have a metadata agent set (usually personal video libraries)
.filter((library) => library.agent !== 'com.plexapp.agents.none')
.map((library) => {
const existing = settings.plex.libraries.find(
(l) => l.id === library.key && l.name === library.title
);

return {
id: library.key,
name: library.title,
enabled: existing?.enabled ?? false,
type: library.type,
lastScan: existing?.lastScan,
};
});

settings.plex.libraries = newLibraries;
} catch (e) {
logger.error('Failed to fetch Plex libraries', {
label: 'Plex API',
message: e.message,
});

settings.plex.libraries = newLibraries;
settings.plex.libraries = [];
}

settings.save();
}

Expand Down
7 changes: 4 additions & 3 deletions server/index.ts
Expand Up @@ -63,11 +63,12 @@ app
});

if (admin) {
const plexapi = new PlexAPI({ plexToken: admin.plexToken });
await plexapi.syncLibraries();
logger.info('Migrating libraries to include media type', {
logger.info('Migrating Plex libraries to include media type', {
label: 'Settings',
});

const plexapi = new PlexAPI({ plexToken: admin.plexToken });
await plexapi.syncLibraries();
}
}

Expand Down

0 comments on commit ed53810

Please sign in to comment.