Skip to content

Better implementation for loading files from a ZIP #75

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

Closed
bertfrees wants to merge 2 commits into from
Closed

Better implementation for loading files from a ZIP #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce7c1eb
Better implementation for loading files from a ZIP
bertfrees Sep 17, 2019
329ab1b
Add missing import
bertfrees Apr 15, 2020
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
1 change: 1 addition & 0 deletions src/main/resources/content/xml/xproc/utils/document.xpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<p:import href="../utils/load.xpl"/>
<p:import href="../utils/recursive-directory-list.xpl"/>
<p:import href="../utils/logging-library.xpl"/>
<p:import href="http://xmlcalabash.com/extension/steps/library-1.0.xpl"/>

<p:variable name="type" select="/*/@type"/>
<p:variable name="select" select="/*/@select"/>
Expand Down
37 changes: 8 additions & 29 deletions src/main/resources/content/xml/xproc/utils/load.xpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" name="main" type="pxi:load" xmlns:cx="http://xmlcalabash.com/ns/extensions" version="1.0" xmlns:pxi="http://www.daisy.org/ns/xprocspec/xproc-internal/">
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" name="main" type="pxi:load" version="1.0" xmlns:pxi="http://www.daisy.org/ns/xprocspec/xproc-internal/">

<p:output port="result"/>

Expand Down Expand Up @@ -59,61 +59,40 @@
<p:sink/>

<p:choose>
<p:when test="contains($href, '!/')">
<pxi:message>
<p:input port="source">
<p:inline>
<doc/>
</p:inline>
</p:input>
<p:with-option name="message" select="replace($href, '^([^!]+)!/(.+)$', 'loading $2 from ZIP $1')"/>
<p:with-option name="logfile" select="$logfile">
<p:empty/>
</p:with-option>
</pxi:message>
<p:sink/>
<cx:unzip>
<!--
note that "file" needs to be specified before "href" because otherwise $href
variable in select part is affected
-->
<p:with-option name="file" select="replace($href, '^([^!]+)!/(.+)$', '$2')"/>
<p:with-option name="href" select="replace($href, '^([^!]+)!/(.+)$', '$1')"/>
</cx:unzip>
</p:when>
<p:variable name="href-maybe-in-zip" select="if (contains($href,'!/')) then replace($href,'^file:','jar:file:') else $href"/>

<!-- Force HTML -->
<p:when test="$method='html'">
<pxi:html-load>
<p:with-option name="href" select="$href"/>
<p:with-option name="href" select="$href-maybe-in-zip"/>
</pxi:html-load>
</p:when>

<!-- XML -->
<p:when test="$method='xml'">
<p:load>
<p:with-option name="href" select="$href"/>
<p:with-option name="href" select="$href-maybe-in-zip"/>
</p:load>
</p:when>

<!-- text -->
<p:when test="$method='text'">
<pxi:load-text>
<p:with-option name="href" select="$href"/>
<p:with-option name="href" select="$href-maybe-in-zip"/>
</pxi:load-text>
</p:when>

<!-- HTML -->
<p:when test="matches(lower-case($href),'\.x?html?$')">
<p:when test="matches(lower-case($href-maybe-in-zip),'\.x?html?$')">
<pxi:html-load>
<p:with-option name="href" select="$href"/>
<p:with-option name="href" select="$href-maybe-in-zip"/>
</pxi:html-load>
</p:when>

<!-- default to 'binary' -->
<p:otherwise>
<pxi:load-binary>
<p:with-option name="href" select="$href"/>
<p:with-option name="href" select="$href-maybe-in-zip"/>
</pxi:load-binary>
</p:otherwise>
</p:choose>
Expand Down