Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify relative path handling.

Browse source 
--HG--
extra : rebase_source : d20290cad2dca3ea1f04a85f899c026c0991bbe5
This commit is contained in:
Sébastien Lucas 2013-08-30 10:35:15 +02:00
parent 881f76d87a
commit 30f801443e
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
epubfs.php
View file

@ -13,27 +13,34 @@ $book = new EPub ("c:/Temp/Phare.epub");
$book->initSpineComponent (); $book->initSpineComponent ();
$component = $_GET["comp"]; $component = $_GET["comp"];
$elementPath = NULL;
if (!empty ($_GET) && isset($_GET["path"]) && $_GET["path"] != "") {
$elementPath = $_GET["path"];
}
if (empty ($component)) { if (empty ($component)) {
notFound (); notFound ();
} }
try { try {
$data = $book->component ($component, $elementPath); $data = $book->component ($component);
$directory = dirname ($component); $directory = dirname ($component);
$data = preg_replace ("/src=[\"']([^:]*?)[\"']/", "src='epubfs.php?path=$1&comp=$component'", $data); $callback = function ($m) use ($book, $component) {
$data = preg_replace ("/href=[\"']([^:]*?)[\"']/", "href='epubfs.php?path=$1&comp=$component'", $data); $method = $m[1];
$data = preg_replace ("/\@import\s+[\"'](.*?)[\"'];/", "@import 'epubfs.php?comp={$directory}/$1';", $data); $path = $m[2];
if (preg_match ("/^#/", $path)) {
return $path;
}
$comp = $book->getComponentName ($component, $path);
return "$method'epubfs.php?comp=$comp'";
};
$data = preg_replace_callback ("/(src=)[\"']([^:]*?)[\"']/", $callback, $data);
$data = preg_replace_callback ("/(href=)[\"']([^:]*?)[\"']/", $callback, $data);
$data = preg_replace_callback ("/(\@import\s+)[\"'](.*?)[\"'];/", $callback, $data);
header ("Content-Type: " . $book->componentContentType($component)); header ("Content-Type: " . $book->componentContentType($component));
echo $data; echo $data;
} }
catch (Exception $e) { catch (Exception $e) {
error_log ($e);
notFound (); notFound ();
} }

15
resources/php-epub-meta/epub.php
View file

@ -153,9 +153,9 @@ class EPub {
/** /**
* Get the component content * Get the component content
*/ */
public function component($comp, $elementPath) { public function component($comp) {
$path = str_replace ("-SLASH-", "/", $comp); $path = str_replace ("-SLASH-", "/", $comp);
$path = $this->getFullPath ($path, $elementPath); $path = $this->getFullPath ($path);
if (!$this->zip->FileExists($path)) { if (!$this->zip->FileExists($path)) {
throw new Exception ("Unable to find " . $path); throw new Exception ("Unable to find " . $path);
} }
@ -164,6 +164,15 @@ class EPub {
return $data; return $data;
} }
public function getComponentName ($comp, $elementPath) {
$path = str_replace ("-SLASH-", "/", $comp);
$path = $this->getFullPath ($path, $elementPath);
if (!$this->zip->FileExists($path)) {
throw new Exception ("Unable to find " . $path);
}
return str_replace ("/", "-SLASH-", $path);
}
/** /**
* Get the component content type * Get the component content type
*/ */
@ -533,7 +542,7 @@ class EPub {
if (!empty ($context)) { if (!empty ($context)) {
$path = $this->combine (dirname ($path), $context); $path = $this->combine (dirname ($path), $context);
} }
error_log ("FullPath : $path ($file / $context)"); //error_log ("FullPath : $path ($file / $context)");
return $path; return $path;
} }