fix: skip failed EPUB during multiple publication import (PR #680 Fixes

#626)

src/common/models/toast.ts

@@ -8,4 +8,5 @@
 export enum ToastType {
  DownloadComplete = "download-complete",
  DownloadStarted = "download-started",
+ DownloadFailed = "download-failed",
 }

src/main/api/publication.ts

@@ -5,6 +5,7 @@
 // that can be found in the LICENSE file exposed on Github (readium) in the project repository.
 // ==LICENSE-END==
 
+import * as debug_ from "debug";
 import { inject, injectable } from "inversify";
 import { ToastType } from "readium-desktop/common/models/toast";
 import { open } from "readium-desktop/common/redux/actions/toast";
@@ -19,6 +20,9 @@ import { Store } from "redux";
 import { downloadActions } from "readium-desktop/common/redux/actions";
 import { ImportState } from "readium-desktop/common/redux/states/import";
 
+// Logger
+const debug = debug_("readium-desktop:main#services/catalog");
+
 @injectable()
 export class PublicationApi {
  @inject("publication-repository")
@@ -122,8 +126,16 @@ export class PublicationApi {
  const newDocs = [];
 
  for (const path of paths) {
- const newDoc = await this.catalogService.importFile(path);
- newDocs.push(newDoc);
+ try {
+ const newDoc = await this.catalogService.importFile(path);
+ if (newDoc) {
+ newDocs.push(newDoc);
+ }
+ } catch (error) {
+ debug(`Import file - FAIL : ${path}`, error);
+ this.dispatchToastRequest(ToastType.DownloadFailed,
+ this.translator.translate("message.import.fail", {path}));
+ }
  }
 
  return newDocs.map((doc) => {

src/main/services/catalog.ts

@@ -59,11 +59,13 @@ export class CatalogService {
  public async importFile(filePath: string, isLcpFile?: boolean): Promise<PublicationDocument> {
  const ext = path.extname(filePath);
 
+ debug("Import File - START");
  if (ext === ".lcpl" || (ext === ".part" && isLcpFile)) {
  return this.importLcplFile(filePath);
  } else if (/\.epub[3]?$/.test(ext) || (ext === ".part" && !isLcpFile)) {
  return this.importEpubFile(filePath);
  }
+ debug("Import File - END");
 
  return null;
  }

src/renderer/assets/styles/toast.css

@@ -21,6 +21,14 @@
  animation-name: start;
  animation-duration: 0.5s;
 
+ &.error {
+ background: rgba(255, 0, 0, 0.1);
+ }
+
+ &.success {
+ background: rgba(0, 255, 0, 0.1);
+ }
+
  & p {
  margin: 0;
  flex: 1;

src/renderer/components/toast/Toast.tsx

@@ -16,13 +16,21 @@ import { TranslatorProps, withTranslator } from "../utils/translator";
 
 import * as styles from "readium-desktop/renderer/assets/styles/toast.css";
 
+export enum ToastType {
+ Error,
+ Default,
+ Success,
+
+}
+
 interface Props extends TranslatorProps {
  close: (id: string) => void;
  className?: string;
  id?: string;
  icon?: any;
  message?: string;
  displaySystemNotification: boolean;
+ type?: ToastType;
 }
 
 interface State {
@@ -61,12 +69,29 @@ export class Toast extends React.Component<Props, State> {
  }
 
  public render(): React.ReactElement<{}> {
- const { icon } = this.props;
+ const { icon, type } = this.props;
  const { willLeave, toRemove } = this.state;
+
+ let typeClassName: string;
+ switch (type) {
+ case ToastType.Error:
+ typeClassName = styles.error;
+ break;
+ case ToastType.Success:
+ typeClassName = styles.success;
+ break;
+ default:
+ break;
+ }
  return (
  <div
  ref={(ref) => this.ref = ref}
- className={classNames(styles.toast, willLeave && styles.leave, toRemove && styles.toRemove)}
+ className={classNames(
+ styles.toast,
+ willLeave && styles.leave,
+ toRemove && styles.toRemove,
+ typeClassName,
+ )}
  >
  { icon && <SVG className={styles.icon} svg={icon} /> }
  <p>{ this.props.message }</p>

src/renderer/components/toast/ToastManager.tsx

@@ -15,7 +15,7 @@ import { ToastState } from "readium-desktop/common/redux/states/toast";
 
 import { RootState } from "readium-desktop/renderer/redux/states";
 
-import Toast from "./Toast";
+import Toast, {ToastType as CompToastType} from "./Toast";
 
 import * as DownloadIcon from "readium-desktop/renderer/assets/icons/download.svg";
 
@@ -67,6 +67,8 @@ export class ToastManager extends React.Component<Props, State> {
  return this.buildFileImportToast(toast, id);
  case ToastType.DownloadStarted:
  return this.buildFileImportStartToast(toast, id);
+ case ToastType.DownloadFailed:
+ return this.buildFileImportFailToast(toast, id);
  default:
  return (<></>);
  }
@@ -99,6 +101,18 @@ export class ToastManager extends React.Component<Props, State> {
  );
  }
 
+ private buildFileImportFailToast(toast: ToastState, id: string) {
+ return (
+ <Toast
+ message={toast.data}
+ key={id}
+ icon={ DownloadIcon }
+ close={ () => this.close(id) }
+ type={CompToastType.Error}
+ />
+ );
+ }
+
  private close(id: string) {
  const { toastList } = this.state;
  toastList[id] = undefined;

src/resources/locales/de.json

@@ -94,7 +94,8 @@
  "success": "Der Download von {{- title}} wurde abgeschlossen"
  },
  "import": {
- "success": ""
+ "fail": "Der Import von {{- path}} ist fehlgeschlagen. Stellen Sie sicher, dass die Datei gültig ist",
+ "success": "Der Import von {{- title}} ist abgeschlossen."
  }
  },
  "opds": {

src/resources/locales/en.json

@@ -94,6 +94,7 @@
  "success": "The download of {{- title}} is finished."
  },
  "import": {
+ "fail": "The import of {{- path}} failed. Verify that the file is valid",
  "success": "The import of {{- title}} is finished."
  }
  },

src/resources/locales/fr.json

@@ -94,6 +94,7 @@
  "success": "Le téléchargement de {{- title}} est terminé."
  },
  "import": {
+ "fail": "L'importation de {{- path}} a échoué. Vérifier que le fichier est valide",
  "success": "L'import de {{- title}} est terminé."
  }
  },

src/typings/en.translation.d.ts

@@ -174,12 +174,13 @@ declare namespace typed_i18n {
  readonly "start": string,
  readonly "success": string
  },
- readonly "import": { readonly "success": string }
+ readonly "import": { readonly "fail": string, readonly "success": string }
 };
  (_: "message.download", __?: {}): { readonly "start": string, readonly "success": string };
  (_: "message.download.start", __?: {}): string;
  (_: "message.download.success", __?: {}): string;
- (_: "message.import", __?: {}): { readonly "success": string };
+ (_: "message.import", __?: {}): { readonly "fail": string, readonly "success": string };
+ (_: "message.import.fail", __?: {}): string;
  (_: "message.import.success", __?: {}): string;
  (_: "opds", __?: {}): {
  readonly "addForm": {