github/bower
1
1
Fork 0
mirror of https://github.com/bower/bower.git synced 2026-02-11 14:34:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace util/osJunk with junk module

Browse Source
This commit is contained in:
Sindre Sorhus
2013-05-05 01:53:42 +02:00
parent f25903905c
commit 083cb9cc9a
5 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resolve/resolvers/FsResolver.js
View File

@@ -7,7 +7,7 @@ var Resolver = require('../Resolver');
var copy = require('../../util/copy');
var extract = require('../../util/extract');
var createError = require('../../util/createError');
var osJunk = require('../../util/osJunk');
var junk = require('junk');
var FsResolver = function (source, options) {
Resolver.call(this, source, options);
@@ -89,7 +89,7 @@ FsResolver.prototype._rename = function () {
// Remove any OS specific files from the files array
// before checking its length
files = files.filter(osJunk.isNotOsJunk);
files = files.filter(junk.isnt);
if (files.length === 1) {
file = files[0];

4
lib/resolve/resolvers/UrlResolver.js
View File

@@ -7,7 +7,7 @@ var mout = require('mout');
var Resolver = require('../Resolver');
var extract = require('../../util/extract');
var createError = require('../../util/createError');
var osJunk = require('../../util/osJunk');
var junk = require('junk');
var UrlResolver = function (source, options) {
var pos;
@@ -176,7 +176,7 @@ UrlResolver.prototype._rename = function () {
// Remove any OS specific files from the files array
// before checking its length
files = files.filter(osJunk.isNotOsJunk);
files = files.filter(junk.isnt);
if (files.length === 1) {
file = files[0];

4
lib/util/extract.js
View File

@@ -5,7 +5,7 @@ var unzip = require('unzip');
var tar = require('tar');
var Q = require('q');
var mout = require('mout');
var osJunk = require('./osJunk');
var junk = require('junk');
// This forces the default chunk size to something small in an attempt
// to avoid issue #314
@@ -99,7 +99,7 @@ function isSingleDir(dir) {
// Remove any OS specific files from the files array
// before checking its length
files = files.filter(osJunk.isNotOsJunk);
files = files.filter(junk.isnt);
if (files.length !== 1) {
return false;

29
lib/util/osJunk.js
View File

@@ -1,29 +0,0 @@
var osJunk = [
// MacOSX
/^__MACOSX$/,
/^\.DS_Store/,
/^\.AppleDouble$/,
/^\.LSOverride$/,
/\.Trashes/,
/^\._.*/,
/^.Spotlight-V100$/,
/^Icon[\r\?]?/,
// Windows
/^ehthumbs\.db$/,
/^Thumbs\.db$/,
/^Desktop.ini$/
];
function isOsJunk(filename) {
return osJunk.some(function (extra) {
return extra.test(filename);
});
}
function isNotOsJunk(filename) {
return !isOsJunk(filename);
}
module.exports.isOsJunk = isOsJunk;
module.exports.isNotOsJunk = isNotOsJunk;
module.exports.osJunk = osJunk;