Skip to content

Commit

Permalink
Close #1 PR: recognize single word urls.
Browse files Browse the repository at this point in the history
  • Loading branch information
Abhishek Sharma authored and sindresorhus committed Sep 29, 2015
1 parent df6c1e9 commit 177b4bf
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ var parseHeaders = require('parse-headers');
var pkg = require('./package.json');

var options = subarg(process.argv.slice(2), {
boolean: [
'boolean': [
'verbose',
'crop',
'help',
'version'
],
default: {
'default': {
delay: 0,
scale: 1
},
alias: {
'alias': {
v: 'verbose',
c: 'crop',
d: 'delay'
Expand Down Expand Up @@ -161,8 +161,18 @@ function parse(args, globalOptions) {
options.hide = arrify(options.hide);
}

var url = arrayUniq(arg.filter(/./.test, /\.|localhost/));
var sizes = arrayUniq(arg.filter(/./.test, /^\d{3,4}x\d{3,4}$/i));
// var basicUrlRegex = /\.|localhost/;
var urlRegex = /(http(s)?:\/\/)([^.]+)|localhost|\./;
var sizeRegex = /^\d{3,4}x\d{3,4}$/i;

var url = arrayUniq(arg.filter(function (a) {
return urlRegex.test(a); // || basicUrlRegex.test(a);
}));

var sizes = arrayUniq(arg.filter(function (a) {
return sizeRegex.test(a);
}));

var keywords = arrayDiffer(arg, url.concat(sizes));

return {
Expand Down Expand Up @@ -205,7 +215,6 @@ function init(args, options) {

var parsedArgs = parse(args, options);
var items = get(parsedArgs);

generate(items, options);
}

Expand Down

0 comments on commit 177b4bf

Please sign in to comment.