Infrastructure/verdaccio
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2025-02-17 23:45:29 -05:00
Code Issues Activity

refactor: remove inner references for local storage

Browse source
This commit is contained in:
Juan Picado @jotadeveloper 2017-10-21 23:02:31 +02:00 • committed by juanpicado
parent 6e35e10a72
commit 3d53d96d80
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -15,8 +15,8 @@
"verdaccio": "./bin/verdaccio" "verdaccio": "./bin/verdaccio"
}, },
"dependencies": { "dependencies": {
"@verdaccio/file-locking": "^0.0.3", "@verdaccio/file-locking": "0.0.5",
"@verdaccio/local-storage": "0.0.6", "@verdaccio/local-storage": "0.0.8",
"@verdaccio/streams": "^0.0.2", "@verdaccio/streams": "^0.0.2",
"@verdaccio/types": "0.0.4", "@verdaccio/types": "0.0.4",
"JSONStream": "^1.1.1", "JSONStream": "^1.1.1",

2
src/lib/config.js
View file

@ -211,7 +211,7 @@ class Config {
* @return {String} * @return {String}
*/ */
checkSecretKey(secret) { checkSecretKey(secret) {
if (_.isNil(secret) === false) { if (_.isNil(secret) === false && secret !== '') {
this.secret = secret; this.secret = secret;
return secret; return secret;
} }

2
src/lib/search.js
View file

@ -61,7 +61,7 @@ class Search {
*/ */
reindex() { reindex() {
let self = this; let self = this;
this.storage.get_local(function(err, packages) { this.storage.getLocalDatabase(function(err, packages) {
if (err) throw err; // that function shouldn't produce any if (err) throw err; // that function shouldn't produce any
let i = packages.length; let i = packages.length;
while (i--) { while (i--) {

7
src/lib/storage.js
View file

@ -37,9 +37,6 @@ class Storage {
this.config = config; this.config = config;
this._setupUpLinks(this.config); this._setupUpLinks(this.config);
this.localStorage = new LocalStorage(config, Logger.logger, Utils); this.localStorage = new LocalStorage(config, Logger.logger, Utils);
this.localStorage.localList.data.secret = this.config.checkSecretKey(this.localStorage.localList.data.secret);
this.localStorage.localList.sync();
// an instance for local storage
this.logger = Logger.logger.child(); this.logger = Logger.logger.child();
} }
@ -461,9 +458,9 @@ class Storage {
* Retrieve only private local packages * Retrieve only private local packages
* @param {*} callback * @param {*} callback
*/ */
get_local(callback) { getLocalDatabase(callback) {
let self = this; let self = this;
let locals = this.localStorage.localList.get(); let locals = this.localStorage.localData.get();
let packages = []; let packages = [];
const getPackage = function(i) { const getPackage = function(i) {

13
yarn.lock
View file

@ -2,6 +2,13 @@
# yarn lockfile v1 # yarn lockfile v1
"@verdaccio/file-locking@0.0.5":
version "0.0.5"
resolved "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-0.0.5.tgz#6172dfa2f7094a1da8e4c14906bfa33836b5713d"
dependencies:
lockfile "1.0.3"
lodash "4.17.4"
"@verdaccio/file-locking@^0.0.3": "@verdaccio/file-locking@^0.0.3":
version "0.0.3" version "0.0.3"
resolved "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-0.0.3.tgz#32d3702ff5184d1d3893f0f1d47629ad33d1c113" resolved "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-0.0.3.tgz#32d3702ff5184d1d3893f0f1d47629ad33d1c113"
@ -10,9 +17,9 @@
lockfile "1.0.3" lockfile "1.0.3"
lodash "4.17.4" lodash "4.17.4"
"@verdaccio/local-storage@0.0.6": "@verdaccio/local-storage@0.0.7":
version "0.0.6" version "0.0.7"
resolved "https://registry.npmjs.org/@verdaccio/local-storage/-/local-storage-0.0.6.tgz#fae664f81fd71fd15c9d0c804a545b170fb9eaa0" resolved "https://registry.npmjs.org/@verdaccio/local-storage/-/local-storage-0.0.7.tgz#3d1679b894028d598562e220809d1b1651ae3746"
dependencies: dependencies:
"@verdaccio/file-locking" "^0.0.3" "@verdaccio/file-locking" "^0.0.3"
"@verdaccio/streams" "^0.0.2" "@verdaccio/streams" "^0.0.2"