Fixing #376 #460
Fixing #376 #460
Conversation
…-online-tools" This reverts commit 78ec797, reversing changes made to 9b1f727.
…age/spdx-online-tools"" This reverts commit ac22c1d.
src/app/core.py
Outdated
| @@ -316,7 +317,7 @@ def license_validate_helper(request): | |||
| fs = FileSystemStorage(location=settings.MEDIA_ROOT +"/"+ folder, | |||
| base_url=urljoin(settings.MEDIA_URL, folder+'/') | |||
| ) | |||
| filename = fs.save(myfile.name, myfile) | |||
| filename = fs.save(unicodedata.normalize('NFKD', myfile.name).encode('ASCII', 'ignore').decode('ASCII'), myfile) | |||
There was a problem hiding this comment.
@BanulaKumarage Can you please explain the changes. There seems to be a lot of encode/decode happening. Since this is the main flow, don't want to merge until I understand what exactly it does.
Also, can you create a util to do this since this would be required at other places as well.
Also, having some UT for this would be good.
There was a problem hiding this comment.
unicodedata.normalize method, converts any special character into their equivalent base characters or combinations of base characters. (ex: converting é to e ) Then the text is converted to ASCII characters. But if there is any character cannot convert it is replaced with a empty string( done by ignore)
Finally, the resulting ASCII-encoded string is decoded back into a regular Python string, which can then be used as the filename. ( converting b'mariadblatest.spdx' to mariadblatest.spdx )
|
Update PR heading as well. |
![sonatype-lift[bot]](https://avatars.githubusercontent.com/in/9843?s=60&v=4){kind=small}
| @@ -316,7 +316,7 @@ def license_validate_helper(request): | |||
| fs = FileSystemStorage(location=settings.MEDIA_ROOT +"/"+ folder, | |||
| base_url=urljoin(settings.MEDIA_URL, folder+'/') | |||
| ) | |||
| filename = fs.save(myfile.name, myfile) | |||
| filename = fs.save(utils.removeSpecialCharacters(myfile.name), myfile) | |||
There was a problem hiding this comment.
E501: line too long (82 > 79 characters)
ℹ️ Expand to see all @sonatype-lift commands
You can reply with the following commands. For example, reply with @sonatype-lift ignoreall to leave out all findings.
| Command | Usage |
|---|---|
@sonatype-lift ignore |
Leave out the above finding from this PR |
@sonatype-lift ignoreall |
Leave out all the existing findings from this PR |
@sonatype-lift exclude <file|issue|path|tool> |
Exclude specified file|issue|path|tool from Lift findings by updating your config.toml file |
Note: When talking to LiftBot, you need to refresh the page to see its response.
Click here to add LiftBot to another repo.
Help us improve LIFT! (Sonatype LiftBot external survey)
Was this a good recommendation for you? Answering this survey will not impact your Lift settings.
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]
|
This doesn't seem to work for me on Mac - Upload Online tools also failing with colon in filename with these changes I think it's better to substitute all illegal filename characters instead, will push the changes. |
|
Thanks @BanulaKumarage for all the contributions! Need to merge the fix asap so creating a new PR on top of these changes. |
fs.url(filename)line 321 inapp/core.pyBut the file is saved without converting in line 320. Therefore, the file is unable to find.app/mediaby converting its non-ASCII characters to ASCII characters. Then issue Validating an SPDX file with colon in name fails #376 is fixed.