Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update Promise.reject()(s) across codebase to throw Error("message"), instead of regular string #5144

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion src/components/accessSchedule/accessSchedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export function show(options) {
if (dlg.submitted) {
resolve(options.schedule);
} else {
reject();
reject(new Error('AccessSchedule closed without resolving'));
}
});
dlg.querySelector('.btnCancel').addEventListener('click', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/collectionEditor/collectionEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ class CollectionEditor {
return Promise.resolve();
}

return Promise.reject();
return Promise.reject(new Error('CollectionEditorError'));
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/confirm/confirm.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async function nativeConfirm(options) {
if (result) {
return Promise.resolve();
} else {
return Promise.reject();
return Promise.reject(new Error('UseNativeConfirmError'));
}
}

Expand Down Expand Up @@ -65,7 +65,7 @@ async function customConfirm(text, title) {
return Promise.resolve();
}

return Promise.reject();
return Promise.reject(new Error('CustomConfirmError'));
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function showDialog(options = { dialogOptions: {}, buttons: [] }) {
if (dialogResult) {
return dialogResult;
} else {
return Promise.reject();
return Promise.reject(new Error('ShowDialogError'));
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/directorybrowser/directorybrowser.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ function validatePath(path, validateWriteable, apiClient) {
if (response) {
if (response.status === 404) {
alertText(globalize.translate('PathNotFound'));
return Promise.reject();
return Promise.reject(new Error('PathNotFoundError'));
}
if (response.status === 500) {
if (validateWriteable) {
alertText(globalize.translate('WriteAccessRequired'));
} else {
alertText(globalize.translate('PathNotFound'));
}
return Promise.reject();
return Promise.reject(new Error('ValidatePathError'));
}
}
return Promise.resolve();
Expand Down
4 changes: 2 additions & 2 deletions src/components/fetchhelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function fetchWithTimeout(url, options, timeoutMs) {

console.debug(`fetchWithTimeout: timed out connecting to url: ${url}`);

reject(error);
reject(new Error(error));
});
});
}
Expand Down Expand Up @@ -99,7 +99,7 @@ export function ajax(request) {
return response;
}
} else {
return Promise.reject(response);
return Promise.reject(new Error(response));
}
}, function (err) {
console.error(`request failed to url: ${request.url}`);
Expand Down
2 changes: 1 addition & 1 deletion src/components/guide/guide-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function showEditor(options) {
if (settingsChanged) {
resolve();
} else {
reject();
reject(new Error('ShowEditorError'));
}
});

Expand Down
14 changes: 7 additions & 7 deletions src/components/htmlMediaHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function handleHlsJsMediaError(instance, reject) {
console.error('cannot recover, last media error recovery failed ...');

if (reject) {
reject();
reject(new Error('HlsJsMediaError'));
} else {
onErrorInternal(instance, MediaError.FATAL_HLS_ERROR);
}
Expand Down Expand Up @@ -200,15 +200,15 @@ export function playWithPromise(elem, onErrorFn) {
// swallow this error because the user can still click the play button on the video element
return Promise.resolve();
}
return Promise.reject(e);
return Promise.reject(new Error(e));
})
.then(() => {
onSuccessfulPlay(elem, onErrorFn);
return Promise.resolve();
});
} catch (err) {
console.error('error calling video.play: ' + err);
return Promise.reject();
return Promise.reject(new Error('VideoPlayError'));
}
}

Expand Down Expand Up @@ -257,7 +257,7 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
hls.on(Hls.Events.MANIFEST_PARSED, function () {
playWithPromise(elem, onErrorFn).then(resolve, function () {
if (reject) {
reject();
reject(new Error('BindEventsToHlsPlayerError'));
reject = null;
}
});
Expand All @@ -276,7 +276,7 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
hls.destroy();

if (reject) {
reject(MediaError.SERVER_ERROR);
reject(new Error(MediaError.SERVER_ERROR));
reject = null;
} else {
onErrorInternal(instance, MediaError.SERVER_ERROR);
Expand All @@ -298,7 +298,7 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
hls.destroy();

if (reject) {
reject(MediaError.NETWORK_ERROR);
reject(new Error(MediaError.NETWORK_ERROR));
reject = null;
} else {
onErrorInternal(instance, MediaError.NETWORK_ERROR);
Expand All @@ -322,7 +322,7 @@ export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, r
hls.destroy();

if (reject) {
reject();
reject(new Error('HlsError'));
reject = null;
} else {
onErrorInternal(instance, MediaError.FATAL_HLS_ERROR);
Expand Down
2 changes: 1 addition & 1 deletion src/components/imageDownloader/imageDownloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ function onDialogClosed() {
if (hasChanges) {
currentResolve();
} else {
currentReject();
currentReject(new Error('OnDialogClosedError'));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/imageeditor/imageeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ function showEditor(options, resolve, reject) {
if (hasChanges) {
resolve();
} else {
reject();
reject(new Error('ShowEditorError'));
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/itemContextMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ function executeCommand(item, id, options) {
deleteSeriesTimer(apiClient, item, resolve, id);
break;
default:
reject();
reject(new Error('ExecuteCommandError'));
break;
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/itemidentifier/itemidentifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ function onDialogClosed() {
if (hasChanges) {
currentResolve();
} else {
currentReject();
currentReject(new Error('OnDialogClosedError'));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/lyricseditor/lyricseditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ function showEditorInternal(itemId, serverId) {
if (hasChanges) {
resolve();
} else {
reject();
reject(new Error('ShowEditorInternalError'));
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/metadataEditor/personEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function show(person) {
if (submitted) {
resolve(person);
} else {
reject();
reject(new Error('PersonEditorError'));
}
});

Expand Down
18 changes: 9 additions & 9 deletions src/components/playback/playbackmanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ function getOptimalMediaSource(apiClient, item, versions) {
});

if (!promises.length) {
return Promise.reject();
return Promise.reject(new Error('GetOptimalMediaSourceError'));
}

return Promise.all(promises).then(function (results) {
Expand Down Expand Up @@ -2271,7 +2271,7 @@ export class PlaybackManager {
// If it's still null then there's nothing to play
if (!firstItem) {
showPlaybackInfoErrorMessage(self, `PlaybackError.${MediaError.NO_MEDIA_ERROR}`);
return Promise.reject();
return Promise.reject(new Error(MediaError.NO_MEDIA_ERROR));
}

if (firstItem.MediaType === 'Photo' || firstItem.MediaType === 'Book') {
Expand Down Expand Up @@ -2320,7 +2320,7 @@ export class PlaybackManager {
if (item.IsPlaceHolder) {
loading.hide();
showPlaybackInfoErrorMessage(self, 'PlaybackErrorPlaceHolder');
return Promise.reject();
return Promise.reject(new Error('PlaybackInfoError'));
}

// Normalize defaults to simplfy checks throughout the process
Expand Down Expand Up @@ -2369,7 +2369,7 @@ export class PlaybackManager {
function onInterceptorRejection() {
cancelPlayback();

return Promise.reject();
return Promise.reject(new Error('InterceptorRejectionError'));
}

function onPlaybackRejection(e) {
Expand All @@ -2387,7 +2387,7 @@ export class PlaybackManager {

showPlaybackInfoErrorMessage(self, displayErrorCode);

return Promise.reject();
return Promise.reject(new Error('PlaybackRejectionError'));
}

function destroyPlayer(player) {
Expand Down Expand Up @@ -2935,11 +2935,11 @@ export class PlaybackManager {
}
} else {
showPlaybackInfoErrorMessage(self, `PlaybackError.${MediaError.NO_MEDIA_ERROR}`);
return Promise.reject();
return Promise.reject(new Error('GetOptimalMediaSourceError'));
}
});
} else {
return Promise.reject();
return Promise.reject(new Error('GetPlaybackInfoError'));
}
});
}
Expand Down Expand Up @@ -3720,7 +3720,7 @@ export class PlaybackManager {
const nextItem = this._playQueueManager.getNextItemInfo();

if (!nextItem?.item) {
return Promise.reject();
return Promise.reject(new Error('GetNextItemError'));
}

const apiClient = ServerConnections.getApiClient(nextItem.item.ServerId);
Expand Down Expand Up @@ -3890,7 +3890,7 @@ export class PlaybackManager {
});
}

return Promise.reject();
return Promise.reject(new Error('PlayTrailersError'));
}

getSubtitleUrl(textStream, serverId) {
Expand Down
6 changes: 3 additions & 3 deletions src/components/playback/playersettingsmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function showAspectRatioMenu(player, btn) {
return Promise.resolve();
}

return Promise.reject();
return Promise.reject(new Error('ShowAspectRatioMenuError'));
});
}

Expand All @@ -168,7 +168,7 @@ function showPlaybackRateMenu(player, btn) {
return Promise.resolve();
}

return Promise.reject();
return Promise.reject(new Error('ShowPlaybackRateMenuError'));
});
}

Expand Down Expand Up @@ -283,7 +283,7 @@ function handleSelectedOption(id, options, player) {
break;
}

return Promise.reject();
return Promise.reject(new Error('HandleSelectedOptionError'));
}

export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/playlisteditor/playlisteditor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ export class PlaylistEditor {
return Promise.resolve();
}

return Promise.reject(new Error());
return Promise.reject(new Error('ShowPlaylistEditorError'));
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/prompt/prompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default (() => {
if (submitValue) {
return submitValue;
} else {
return Promise.reject();
return Promise.reject(new Error('PromptError'));
}
});
}
Expand All @@ -107,7 +107,7 @@ export default (() => {
if (result) {
return Promise.resolve(result);
} else {
return Promise.reject(result);
return Promise.reject(new Error(result));
}
};
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/components/recordingcreator/recordingcreator.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function showEditor(itemId, serverId) {
if (currentRecordingFields?.hasChanged()) {
resolve();
} else {
reject();
reject(new Error('CurrentRecordingFieldsError'));
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/recordingcreator/recordinghelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerI
// schedule recording
return createRecording(apiClient, programId);
} else {
return Promise.reject();
return Promise.reject(new Error('ToggleRecordingError'));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/recordingcreator/seriesrecordingeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ function showEditor(itemId, serverId, options) {
deleted: recordingDeleted
});
} else {
reject();
reject(new Error('RecordingUpdatedError'));
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/sortmenu/sortmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class SortMenu {
return;
}

reject();
reject(new Error('SortMenuError'));
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/subtitleeditor/subtitleeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ function showEditorInternal(itemId, serverId) {
if (hasChanges) {
resolve();
} else {
reject();
reject(new Error('SubtitleEditorError'));
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/components/tunerPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function TunerPicker() {
return Promise.resolve(deviceResult);
}

return Promise.reject();
return Promise.reject(new Error('TunerPickerError'));
});
};
}
Expand Down
Loading
Loading