GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-12 06:16:56 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Show an error pop-up when csv import screen fails to load

Browse source 
https://forums.ankiweb.net/t/windows-10-2-1-62-qt6-blank-import-window/30231
This commit is contained in:
Damien Elmes 2023-05-15 15:32:38 +10:00
parent 5f40fd6083
commit 25cd181c9f
3 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt/aqt/mediasrv.py
View file

@ -516,9 +516,11 @@ def _extract_collection_post_request(path: str) -> DynamicRequest | NotFound:
response.headers["Content-Type"] = "application/binary" response.headers["Content-Type"] = "application/binary"
else: else:
response = flask.make_response("", HTTPStatus.NO_CONTENT) response = flask.make_response("", HTTPStatus.NO_CONTENT)
except: except Exception as exc:
print(traceback.format_exc()) print(traceback.format_exc())
response = flask.make_response("", HTTPStatus.INTERNAL_SERVER_ERROR) response = flask.make_response(
str(exc), HTTPStatus.INTERNAL_SERVER_ERROR
)
return response return response
return wrapped return wrapped

12
ts/import-csv/index.ts
View file

@ -5,6 +5,7 @@ import "./import-csv-base.scss";
import { ModuleName, setupI18n } from "@tslib/i18n"; import { ModuleName, setupI18n } from "@tslib/i18n";
import { checkNightMode } from "@tslib/nightmode"; import { checkNightMode } from "@tslib/nightmode";
import type { ImportExport, Notetypes } from "@tslib/proto";
import { Decks, decks as decksService, empty, notetypes as notetypeService } from "@tslib/proto"; import { Decks, decks as decksService, empty, notetypes as notetypeService } from "@tslib/proto";
import ImportCsvPage from "./ImportCsvPage.svelte"; import ImportCsvPage from "./ImportCsvPage.svelte";
@ -32,12 +33,21 @@ const i18n = setupI18n({
export async function setupImportCsvPage(path: string): Promise<ImportCsvPage> { export async function setupImportCsvPage(path: string): Promise<ImportCsvPage> {
const gettingMetadata = getCsvMetadata(path); const gettingMetadata = getCsvMetadata(path);
const [notetypes, decks, metadata] = await Promise.all([
let notetypes: Notetypes.NotetypeNames;
let decks: Decks.DeckNames;
let metadata: ImportExport.CsvMetadata;
try {
[notetypes, decks, metadata] = await Promise.all([
gettingNotetypes, gettingNotetypes,
gettingDecks, gettingDecks,
gettingMetadata, gettingMetadata,
i18n, i18n,
]); ]);
} catch (err) {
alert(err);
throw (err);
}
checkNightMode(); checkNightMode();

7
ts/lib/proto.ts
View file

@ -27,6 +27,8 @@ export { Cards, Collection, Decks, Generic, Notes };
export const empty = Generic.Empty.create(); export const empty = Generic.Empty.create();
export class InternalError extends Error {}
async function serviceCallback( async function serviceCallback(
method: rpc.ServiceMethod<Message<any>, Message<any>>, method: rpc.ServiceMethod<Message<any>, Message<any>>,
requestData: Uint8Array, requestData: Uint8Array,
@ -45,6 +47,11 @@ async function serviceCallback(
body: requestData, body: requestData,
}); });
if (result.status == 500) {
callback(new InternalError(await result.text()), null);
return;
}
const blob = await result.blob(); const blob = await result.blob();
const respBuf = await new Response(blob).arrayBuffer(); const respBuf = await new Response(blob).arrayBuffer();
const uint8Array = new Uint8Array(respBuf); const uint8Array = new Uint8Array(respBuf);