Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-09 22:55:35 +00:00
Code Issues Projects Releases Wiki Activity

Additional info if import fails

Browse Source
This commit is contained in:
Cmdr McDonald
2016-11-13 17:04:57 +00:00
parent 42a2b907ce
commit 5b037e3a00
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/Coriolis.jsx
View File

@@ -78,11 +78,11 @@ export default class Coriolis extends React.Component {
/** /**
* Import a build directly * Import a build directly
* @param r {Object} the route object * @param {Object} r The current route
*/ */
_importBuild(r) { _importBuild(r) {
try { try {
// Need to decode and gunzip the data // Need to decode and gunzip the data, then build the ship
const data = zlib.gunzipSync(new Buffer(Utils.fromUrlSafe(r.params.data), 'base64')); const data = zlib.gunzipSync(new Buffer(Utils.fromUrlSafe(r.params.data), 'base64'));
const json = JSON.parse(data); const json = JSON.parse(data);
const ship = CompanionApiUtils.shipFromJson(json); const ship = CompanionApiUtils.shipFromJson(json);
@@ -90,7 +90,7 @@ export default class Coriolis extends React.Component {
r.params.code = ship.toString(); r.params.code = ship.toString();
this._setPage(OutfittingPage, r); this._setPage(OutfittingPage, r);
} catch (err) { } catch (err) {
this.setState({ error: err }); this._onError("Failed to import ship", r.path, 0, 0, err);
} }
} }

2
src/app/utils/UtilityFunctions.js
View File

@@ -65,7 +65,7 @@ export function shallowEqual(objA, objB) {
* @return {string} the converted string * @return {string} the converted string
*/ */
export function toUrlSafe(data) { export function toUrlSafe(data) {
return data.replace(/\\/g, '-').replace(/\+/g, '_'); return data.replace(/\//g, '-').replace(/\+/g, '_');
} }
/** /**