Browse Source

nest storage directory inside './lib'

master
ansuz 11 months ago
parent
commit
725d10fc60
12 changed files with 18 additions and 18 deletions
  1. 4
      lib/historyKeeper.js
  2. 2
      lib/log.js
  3. 4
      lib/rpc.js
  4. 0
      lib/storage/README.md
  5. 2
      lib/storage/blob.js
  6. 8
      lib/storage/file.js
  7. 0
      lib/storage/tasks.js
  8. 2
      scripts/diagnose-archive-conflicts.js
  9. 4
      scripts/evict-inactive.js
  10. 4
      scripts/expire-channels.js
  11. 4
      scripts/migrations/migrate-tasks-v1.js
  12. 2
      scripts/restore-archived.js

4
lib/historyKeeper.js

@ -63,12 +63,12 @@ module.exports.create = function (config, cb) {
Log.verbose('HK_ID', 'History keeper ID: ' + Env.id); Log.verbose('HK_ID', 'History keeper ID: ' + Env.id);
nThen(function (w) { nThen(function (w) {
require('../storage/file').create(config, w(function (_store) {
require('./storage/file').create(config, w(function (_store) {
config.store = _store; config.store = _store;
Env.store = _store; Env.store = _store;
})); }));
}).nThen(function (w) { }).nThen(function (w) {
require("../storage/tasks").create(config, w(function (e, tasks) {
require("./storage/tasks").create(config, w(function (e, tasks) {
if (e) { if (e) {
throw e; throw e;
} }

2
lib/log.js

@ -1,5 +1,5 @@
/*jshint esversion: 6 */ /*jshint esversion: 6 */
var Store = require("../storage/file");
var Store = require("./storage/file");
var Logger = module.exports; var Logger = module.exports;

4
lib/rpc.js

@ -14,8 +14,8 @@ const Upload = require("./commands/upload");
var RPC = module.exports; var RPC = module.exports;
const Store = require("../storage/file");
const BlobStore = require("../storage/blob");
const Store = require("./storage/file");
const BlobStore = require("./storage/blob");
const UNAUTHENTICATED_CALLS = { const UNAUTHENTICATED_CALLS = {
GET_FILE_SIZE: Pinning.getFileSize, GET_FILE_SIZE: Pinning.getFileSize,

storage/README.md → lib/storage/README.md

storage/blob.js → lib/storage/blob.js

@ -6,7 +6,7 @@ var Path = require("path");
var BlobStore = module.exports; var BlobStore = module.exports;
var nThen = require("nthen"); var nThen = require("nthen");
var Semaphore = require("saferphore"); var Semaphore = require("saferphore");
var Util = require("../lib/common-util");
var Util = require("../common-util");
var isValidSafeKey = function (safeKey) { var isValidSafeKey = function (safeKey) {
return typeof(safeKey) === 'string' && !/\//.test(safeKey) && safeKey.length === 44; return typeof(safeKey) === 'string' && !/\//.test(safeKey) && safeKey.length === 44;

storage/file.js → lib/storage/file.js

@ -6,11 +6,11 @@ var Fse = require("fs-extra");
var Path = require("path"); var Path = require("path");
var nThen = require("nthen"); var nThen = require("nthen");
var Semaphore = require("saferphore"); var Semaphore = require("saferphore");
var Util = require("../lib/common-util");
var Meta = require("../lib/metadata");
var Extras = require("../lib/hk-util");
var Util = require("../common-util");
var Meta = require("../metadata");
var Extras = require("../hk-util");
const Schedule = require("../lib/schedule");
const Schedule = require("../schedule");
const Readline = require("readline"); const Readline = require("readline");
const ToPull = require('stream-to-pull-stream'); const ToPull = require('stream-to-pull-stream');
const Pull = require('pull-stream'); const Pull = require('pull-stream');

storage/tasks.js → lib/storage/tasks.js

2
scripts/diagnose-archive-conflicts.js

@ -1,6 +1,6 @@
var nThen = require("nthen"); var nThen = require("nthen");
var Store = require("../storage/file");
var Store = require("../lib/storage/file");
var config = require("../lib/load-config"); var config = require("../lib/load-config");
var store; var store;

4
scripts/evict-inactive.js

@ -1,7 +1,7 @@
var nThen = require("nthen"); var nThen = require("nthen");
var Store = require("../storage/file");
var BlobStore = require("../storage/blob");
var Store = require("../lib/storage/file");
var BlobStore = require("../lib/storage/blob");
var Pins = require("../lib/pins"); var Pins = require("../lib/pins");
var config = require("../lib/load-config"); var config = require("../lib/load-config");

4
scripts/expire-channels.js

@ -1,9 +1,9 @@
var nThen = require("nthen"); var nThen = require("nthen");
var Tasks = require("../storage/tasks");
var Tasks = require("../lib/storage/tasks");
var Logger = require("../lib/log"); var Logger = require("../lib/log");
var config = require("../lib/load-config"); var config = require("../lib/load-config");
var FileStorage = require('../' + config.storage || './storage/file');
var FileStorage = require('../lib/storage/file');
nThen(function (w) { nThen(function (w) {
Logger.create(config, w(function (_log) { Logger.create(config, w(function (_log) {

4
scripts/migrations/migrate-tasks-v1.js

@ -1,5 +1,5 @@
var nThen = require("nthen"); var nThen = require("nthen");
var Tasks = require("../../storage/tasks");
var Tasks = require("../../lib/storage/tasks");
var Logger = require("../../lib/log"); var Logger = require("../../lib/log");
var config = require("../../lib/load-config"); var config = require("../../lib/load-config");
@ -7,7 +7,7 @@ var config = require("../../lib/load-config");
// this isn't strictly necessary for what we want to do // this isn't strictly necessary for what we want to do
// but the API requires it, and I don't feel like changing that // but the API requires it, and I don't feel like changing that
// --ansuz // --ansuz
var FileStorage = require("../../" + (config.storage || "./storage/file"));
var FileStorage = require("../../lib/storage/file"));
var tasks; var tasks;
nThen(function (w) { nThen(function (w) {

2
scripts/restore-archived.js

@ -1,6 +1,6 @@
var nThen = require("nthen"); var nThen = require("nthen");
var Store = require("../storage/file");
var Store = require("../lib/storage/file");
var config = require("../lib/load-config"); var config = require("../lib/load-config");
var store; var store;

Loading…
Cancel
Save