Fix search keywords with colon

jh-changes
Shin'ya Ueoka 6 years ago
parent cb3637ec74
commit f4d7ca2d70
  1. 30
      src/shared/urls.js
  2. 9
      test/shared/urls.test.js

@ -3,23 +3,29 @@ const trimStart = (str) => {
return str.replace(/^\s+/, ''); return str.replace(/^\s+/, '');
}; };
const SUPPORTED_PROTOCOLS = ['http:', 'https:', 'ftp:', 'mailto:'];
const normalizeUrl = (keywords, searchSettings) => { const normalizeUrl = (keywords, searchSettings) => {
try { try {
return new URL(keywords).href; let u = new URL(keywords);
} catch (e) { if (SUPPORTED_PROTOCOLS.includes(u.protocol.toLowerCase())) {
if (keywords.includes('.') && !keywords.includes(' ')) { return u.href;
return 'http://' + keywords;
} }
let template = searchSettings.engines[searchSettings.default]; } catch (e) {
let query = keywords; // fallthrough
}
if (keywords.includes('.') && !keywords.includes(' ')) {
return 'http://' + keywords;
}
let template = searchSettings.engines[searchSettings.default];
let query = keywords;
let first = trimStart(keywords).split(' ')[0]; let first = trimStart(keywords).split(' ')[0];
if (Object.keys(searchSettings.engines).includes(first)) { if (Object.keys(searchSettings.engines).includes(first)) {
template = searchSettings.engines[first]; template = searchSettings.engines[first];
query = trimStart(trimStart(keywords).slice(first.length)); query = trimStart(trimStart(keywords).slice(first.length));
}
return template.replace('{}', encodeURIComponent(query));
} }
return template.replace('{}', encodeURIComponent(query));
}; };
export { normalizeUrl }; export { normalizeUrl };

@ -11,6 +11,8 @@ describe("shared/commands/parsers", () => {
}; };
it('convertes search url', () => { it('convertes search url', () => {
expect(parsers.normalizeUrl('google.com', config))
.to.equal('http://google.com');
expect(parsers.normalizeUrl('google apple', config)) expect(parsers.normalizeUrl('google apple', config))
.to.equal('https://google.com/search?q=apple'); .to.equal('https://google.com/search?q=apple');
expect(parsers.normalizeUrl('yahoo apple', config)) expect(parsers.normalizeUrl('yahoo apple', config))
@ -25,6 +27,13 @@ describe("shared/commands/parsers", () => {
expect(parsers.normalizeUrl('apple banana', config)) expect(parsers.normalizeUrl('apple banana', config))
.to.equal('https://google.com/search?q=apple%20banana'); .to.equal('https://google.com/search?q=apple%20banana');
}); });
it('searches with a word containing a colon', () => {
expect(parsers.normalizeUrl('foo:', config))
.to.equal('https://google.com/search?q=foo%3A');
expect(parsers.normalizeUrl('std::vector', config))
.to.equal('https://google.com/search?q=std%3A%3Avector');
});
}); });
}); });