Skip to content

Add new setting keepFilename that retains the original filename #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonspalmer wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −5
Open

Add new setting keepFilename that retains the original filename #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions ...s-app/resourceMappers/org/grails/plugin/cachedresources/HashAndCacheResourceMapper.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.grails.plugin.cachedresources
import org.codehaus.groovy.grails.plugins.codecs.SHA256BytesCodec
import org.grails.plugin.cachedresources.util.Base62
import org.grails.plugin.resource.mapper.MapperPhase
import org.apache.commons.io.FilenameUtils

class HashAndCacheResourceMapper {

Expand All @@ -20,7 +21,8 @@ class HashAndCacheResourceMapper {
log.debug "Hashing resources to unique names..."
}

resource.processedFile = renameToHashOfContents(resource.processedFile, resource.processedFileExtension)
def filename = FilenameUtils.getBaseName(resource.processedFile.name)
resource.processedFile = renameToHashOfContents(resource.processedFile, filename, resource.processedFileExtension)
resource.updateActualUrlFromProcessedFile()

// Do all the horrible cache header stuff
Expand Down Expand Up @@ -59,18 +61,29 @@ class HashAndCacheResourceMapper {
boolean getFlattenDirs() {
resourceService.getConfigParamOrDefault('flatten', true)
}

boolean getKeepFilename() {
resourceService.getConfigParamOrDefault('keepFilename', false)
}

/**
* Renames the given input file in the same directory to be the SHA256 hash of it's contents.
*/
def renameToHashOfContents(File input, String extension) {
def newName
def renameToHashOfContents(File input, String filename, String extension) {
def nameHash
if (shortenLinks) {
def hash = SHA256BytesCodec.encode(getBytes(input))
newName = Base62.encode(hash)
nameHash = Base62.encode(hash)
} else {
newName = SHA256Codec.encode(getBytes(input))
nameHash = SHA256Codec.encode(getBytes(input))
}
def newName
if (keepFilename) {
newName = "${filename}_${nameHash}"
} else {
newName = nameHash
}

def parent = flattenDirs ? resourceService.workDir : input.parentFile
def target = new File(parent, extension ? "${newName}.${extension}" : newName)

Expand Down