Skip to content

fix: fslock usage #10

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.

Sign up for GitHub

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

Draft
Alex-Werner wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix: fslock usage #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d19129d
fix issue #1
vedmalex Dec 30, 2020
ec693f4
Merge pull request #9 from vedmalex/master
Alex-Werner Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions src/adapters/FsAdapter/methods/findCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
const Collection = require('../../../types/Collection/Collection');
module.exports = async function findCollection(tyrInstance, dbName, colName, opts){
let col = undefined;
if(!dbName){
throw new Error("Expected dbName");
}
if(!colName){
throw new Error("Expected colName");
}
const path = `${tyrInstance.options.path}/${dbName}/${colName}/meta.json`
const exists = await this.queue.add('File.exists', path).getResults();
if(!exists){
//This is done to match MemoryAdapter way of failing a find
return col;
}
const meta = await this.queue.add('File.read',path).getResults();
col = new Collection(Object.assign(meta,{ adapter:this, tyrInstance}, opts));

return new Promise((resolve)=>{
col.emitter.on('ready', ()=>{
return resolve(col)
})
})
}
module.exports = async function findCollection(tyrInstance, dbName, colName, opts) {
let col;
if (!dbName) {
throw new Error('Expected dbName');
}
if (!colName) {
throw new Error('Expected colName');
}
const path = `${tyrInstance.options.path}/${dbName}/${colName}/meta.json`;
let job = await this.queue.add('File.exists', path).execution();
const exists = job.result;
if (!exists) {
// This is done to match MemoryAdapter way of failing a find
return col;
}
job = await this.queue.add('File.read', path).execution();
const meta = job.result;
col = new Collection(Object.assign(meta, { adapter: this, tyrInstance }, opts));

return new Promise((resolve) => {
col.emitter.on('ready', () => resolve(col));
});
};
31 changes: 17 additions & 14 deletions src/adapters/FsAdapter/methods/findDatabase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
const Database = require('../../../types/Database/Database');
module.exports = async function findDatabase(tyrInstance, dbName, opts){
let db = undefined;
if(!dbName){
throw new Error("Expected dbName");

module.exports = async function findDatabase(tyrInstance, dbName, opts) {
let db;
if (!dbName) {
throw new Error('Expected dbName');
}
const job = await this.queue.add('File.exists', `${tyrInstance.options.path}/${dbName}/meta.json`);
await job.execution();
let job = await this.queue.add('File.exists', `${tyrInstance.options.path}/${dbName}/meta.json`).execution();

const exists = job.results
if(!exists){
//This is done to match MemoryAdapter way of failing a find
const exists = job.results;
if (!exists) {
// This is done to match MemoryAdapter way of failing a find
return db;
}
const meta = await this.queue
.add('File.read',`${tyrInstance.options.path}/${dbName}/meta.json`)
.getResults();

db = new Database(Object.assign(meta,{ adapter:this, tyrInstance}));
job = await this.queue
.add('File.read', `${tyrInstance.options.path}/${dbName}/meta.json`)
.execution();

const meta = job.result;

db = new Database(Object.assign(meta, { adapter: this, tyrInstance }));
return db;
}
};