Compare commits

...

2 Commits

Author SHA1 Message Date
Alexander Rose
fbcef01c55 0.7.0-dev.5 2020-04-23 14:40:43 -07:00
Alexander Rose
641e0639d4 fix filehandle usage in server/ 2020-04-23 14:39:32 -07:00
6 changed files with 6 additions and 6 deletions

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "molstar",
"version": "0.7.0-dev.4",
"version": "0.7.0-dev.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "molstar",
"version": "0.7.0-dev.4",
"version": "0.7.0-dev.5",
"description": "A comprehensive macromolecular library.",
"homepage": "https://github.com/molstar/molstar#readme",
"repository": {

View File

@@ -103,7 +103,7 @@ export function getProviderFromType(type: Type): Provider {
export async function open(name: string, filename: string, type: Type): Promise<Context> {
const provider = getProviderFromType(type);
const descriptor = await File.openRead(filename);
const file = FileHandle.fromDescriptor(descriptor);
const file = FileHandle.fromDescriptor(descriptor, filename);
const header = await provider.readHeader(name, file);
const data = { header, file, slices: void 0 as any };
return { data, provider };

View File

@@ -32,7 +32,7 @@ export async function createContext(filename: string, channels: Format.Context[]
}
const ctx: Data.Context = {
file: FileHandle.fromDescriptor(await File.createFile(filename)),
file: FileHandle.fromDescriptor(await File.createFile(filename), filename),
isPeriodic,
channels,
valueType,

View File

@@ -66,7 +66,7 @@ async function readHeader(filename: string | undefined, sourceId: string) {
let file: FileHandle | undefined;
try {
if (!filename) return void 0;
file = FileHandle.fromDescriptor(await File.openRead(filename));
file = FileHandle.fromDescriptor(await File.openRead(filename), filename);
const header = await DataFormat.readHeader(file);
return header.header;
} catch (e) {

View File

@@ -34,7 +34,7 @@ export default async function execute(params: Data.QueryParams, outputProvider:
let sourceFile: FileHandle | undefined;
try {
sourceFile = FileHandle.fromDescriptor(await File.openRead(params.sourceFilename));
sourceFile = FileHandle.fromDescriptor(await File.openRead(params.sourceFilename), params.sourceFilename);
await _execute(sourceFile, params, guid, outputProvider);
return true;
} catch (e) {