Support the Info-ZIP Unicode Path Extra Field. #41
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,19 +20,21 @@ | |
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.UnsupportedEncodingException; | ||
| import java.net.URL; | ||
| import java.util.Date; | ||
| import java.util.Enumeration; | ||
| import javax.annotation.Nonnull; | ||
|
|
||
| import org.apache.commons.compress.archivers.zip.UnicodePathExtraField; | ||
| import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; | ||
| import org.apache.commons.compress.archivers.zip.ZipFile; | ||
| import org.apache.commons.compress.utils.IOUtils; | ||
|
|
||
| import org.codehaus.plexus.archiver.AbstractUnArchiver; | ||
| import org.codehaus.plexus.archiver.ArchiverException; | ||
| import org.codehaus.plexus.components.io.resources.PlexusIoResource; | ||
|
|
||
| /** | ||
| * @author <a href="mailto:[email protected]">Emmanuel Venisse</a> | ||
| * @version $Id$ | ||
|
|
@@ -84,7 +86,20 @@ private static class ZipEntryFileInfo | |
|
|
||
| public String getName() | ||
| { | ||
| try | ||
| { | ||
| final UnicodePathExtraField unicodePath = | ||
| (UnicodePathExtraField) zipEntry.getExtraField( UnicodePathExtraField.UPATH_ID ); | ||
|
|
||
| return unicodePath != null | ||
| ? new String( unicodePath.getUnicodeName(), "UTF-8" ) | ||
| : zipEntry.getName(); | ||
|
|
||
| } | ||
| catch ( final UnsupportedEncodingException e ) | ||
| { | ||
| throw new AssertionError( e ); | ||
| } | ||
| } | ||
|
|
||
| public boolean isDirectory() | ||
|
|
@@ -141,27 +156,30 @@ protected void execute() | |
| InputStream in = null; | ||
| try | ||
| { | ||
| zf = new org.apache.commons.compress.archivers.zip.ZipFile( getSourceFile(), encoding, true ); | ||
| final Enumeration e = zf.getEntriesInPhysicalOrder(); | ||
| while ( e.hasMoreElements() ) | ||
| { | ||
| final ZipArchiveEntry ze = (ZipArchiveEntry) e.nextElement(); | ||
| final ZipEntryFileInfo fileInfo = new ZipEntryFileInfo( zf, ze ); | ||
| if ( isSelected( fileInfo.getName(), fileInfo ) ) | ||
| { | ||
| in = zf.getInputStream( ze ); | ||
|
|
||
| extractFileIfIncluded( getSourceFile(), getDestDirectory(), in, fileInfo.getName(), | ||
| new Date( ze.getTime() ), ze.isDirectory(), | ||
| ze.getUnixMode() != 0 ? ze.getUnixMode() : null, | ||
| resolveSymlink( zf, ze ) ); | ||
|
|
||
| in.close(); | ||
| in = null; | ||
| } | ||
| } | ||
|
|
||
| zf.close(); | ||
| zf = null; | ||
|
|
||
| getLogger().debug( "expand complete" ); | ||
| } | ||
| catch ( final IOException ioe ) | ||
| { | ||
|
|
@@ -197,9 +215,9 @@ protected void execute( final String path, final File outputDirectory ) | |
| InputStream in = null; | ||
| try | ||
| { | ||
| zipFile = new org.apache.commons.compress.archivers.zip.ZipFile( getSourceFile(), encoding, true ); | ||
|
|
||
| final Enumeration e = zipFile.getEntriesInPhysicalOrder(); | ||
|
|
||
| while ( e.hasMoreElements() ) | ||
| { | ||
|
|
@@ -213,9 +231,12 @@ protected void execute( final String path, final File outputDirectory ) | |
| if ( ze.getName().startsWith( path ) ) | ||
| { | ||
| in = zipFile.getInputStream( ze ); | ||
|
|
||
| extractFileIfIncluded( getSourceFile(), outputDirectory, in, | ||
| ze.getName(), new Date( ze.getTime() ), ze.isDirectory(), | ||
| ze.getUnixMode() != 0 ? ze.getUnixMode() : null, | ||
| resolveSymlink( zipFile, ze ) ); | ||
|
|
||
| in.close(); | ||
| in = null; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What purpose serves this try catch block? No one throws an
IOException. Not thePropertyUtils.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I consider the swallow here was intentional. The local was actually borrowed from other spots where the version is omitted of the
pom.propertiescould not be read. This needs a rewrite now.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Am 05/27/16 um 00:38 schrieb Michael Osipov:
PropertyUtils started throwing the exception with the latest patch
release of 'plexus-utils'.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Am 05/27/16 um 00:57 schrieb Michael Osipov:
Just restored that behaviour. I even considered throwing an
AssertionError if the properties cannot be read. Omitting the version
shouldn't be an issue, of course.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Am 2016-05-27 um 02:51 schrieb Christian Schulte:
I am not convinced that
AssertionErroris the right thing becauseErrorsare reverved for the VM. Please search forpom.propertiesinmaven-core(DefaultRepositorySystemSessionFactoryandDefaultRuntimeInformation). You will see the basic ida it was taken from.