mirror of
https://github.com/balena-io/etcher.git
synced 2025-04-25 15:57:18 +00:00
fix(GUI): ignore casing when checking an image extension validity (#568)
Currently, we take the image extension casing into account when determining if the extension is a recognised one (e.g: `img`, `iso`, etc). This causes an "Invalid image" error to be thrown when selecting an image with an uppercase extension, like `UBUNTU.ISO`. Change-Type: patch Changelog-Entry: Don't throw an "Invalid image" error if the extension is not in lowercase. Fixes: https://github.com/resin-io/etcher/issues/567 Signed-off-by: Juan Cruz Viotti <jviottidc@gmail.com>
This commit is contained in:
parent
9117c10c46
commit
fb893bec36
@ -115,7 +115,7 @@ SupportedFormats.service('SupportedFormatsModel', function() {
|
|||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
this.isSupportedImage = (image) => {
|
this.isSupportedImage = (image) => {
|
||||||
const extension = path.extname(image).slice(1);
|
const extension = path.extname(image).slice(1).toLowerCase();
|
||||||
|
|
||||||
if (_.some([
|
if (_.some([
|
||||||
_.includes(this.getNonCompressedExtensions(), extension),
|
_.includes(this.getNonCompressedExtensions(), extension),
|
||||||
|
@ -78,6 +78,13 @@ describe('Browser: SupportedFormats', function() {
|
|||||||
m.chai.expect(isSupported).to.be.true;
|
m.chai.expect(isSupported).to.be.true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should ignore casing when determining extension validity', function() {
|
||||||
|
const nonCompressedExtension = _.first(SupportedFormatsModel.getNonCompressedExtensions());
|
||||||
|
const imagePath = '/path/to/foo.' + nonCompressedExtension.toUpperCase();
|
||||||
|
const isSupported = SupportedFormatsModel.isSupportedImage(imagePath);
|
||||||
|
m.chai.expect(isSupported).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
it('should not consider an extension before a non compressed extension', function() {
|
it('should not consider an extension before a non compressed extension', function() {
|
||||||
const nonCompressedExtension = _.first(SupportedFormatsModel.getNonCompressedExtensions());
|
const nonCompressedExtension = _.first(SupportedFormatsModel.getNonCompressedExtensions());
|
||||||
const imagePath = '/path/to/foo.1234.' + nonCompressedExtension;
|
const imagePath = '/path/to/foo.1234.' + nonCompressedExtension;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user