updated print
This commit is contained in:
@@ -2,21 +2,21 @@
|
||||
|
||||
/**
|
||||
* @file
|
||||
* common drush functions for the print submodules.
|
||||
* Common drush functions for the print submodules.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Download and extract the lib
|
||||
* Download and extract the lib.
|
||||
*
|
||||
* @param string $library
|
||||
* library to download.
|
||||
* Library to download.
|
||||
* @param string $url
|
||||
* URL of the file to download
|
||||
* URL of the file to download.
|
||||
*/
|
||||
function _print_drush_download_lib($library, $url) {
|
||||
$path = drush_get_option('path');
|
||||
if (empty($path)) {
|
||||
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/sites/all/libraries';
|
||||
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/sites/all/libraries/' . $library;
|
||||
}
|
||||
|
||||
// Create the path if it does not exist.
|
||||
@@ -29,18 +29,21 @@ function _print_drush_download_lib($library, $url) {
|
||||
$olddir = getcwd();
|
||||
drush_op('chdir', $path);
|
||||
|
||||
// Warn about an existing dir
|
||||
// Warn about an existing dir.
|
||||
if (is_dir($library)) {
|
||||
// drush_op('rmdir', $library); // Directory must be empty for the php rmdir to work..
|
||||
drush_log(dt('An existing @library was overwritten at @path', array('@library' => $library, '@path' => $path . '/' . $library)), 'notice');
|
||||
}
|
||||
|
||||
// Download the archive
|
||||
if (preg_match('!api.github.com/repos/.*/releases/latest!', $url)) {
|
||||
$url = _print_drush_github_latest_url($url);
|
||||
}
|
||||
|
||||
// Download the archive.
|
||||
$filename = _print_drush_download_file($url);
|
||||
if ($filename) {
|
||||
$extract_ret = _print_drush_download_extract($filename);
|
||||
if ($extract_ret) {
|
||||
// Remove the archive
|
||||
// Remove the archive.
|
||||
drush_op('unlink', $filename);
|
||||
drush_log(dt('@file has been downloaded and extracted in @path', array('@file' => $filename, '@path' => $path)), 'success');
|
||||
}
|
||||
@@ -58,23 +61,47 @@ function _print_drush_download_lib($library, $url) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Download a file using wget or curl
|
||||
* Get filename of latest from github.
|
||||
*
|
||||
* @param string $github_url
|
||||
* The github URL to the latest project release.
|
||||
*
|
||||
* @return string
|
||||
* The URL to the latest file release.
|
||||
*/
|
||||
function _print_drush_github_latest_url($github_url) {
|
||||
$filename = _print_drush_download_file($github_url);
|
||||
$contents = file_get_contents($filename);
|
||||
drush_op('unlink', $filename);
|
||||
$json = json_decode($contents);
|
||||
if (isset($json->assets[0])) {
|
||||
$download_url = $json->assets[0]->browser_download_url;
|
||||
}
|
||||
else {
|
||||
// Try the zipball_url.
|
||||
$download_url = $json->zipball_url;
|
||||
}
|
||||
|
||||
return $download_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Download a file using wget or curl.
|
||||
*
|
||||
* Adapted from a function in drush/includes/drush.inc to support 302 redirects.
|
||||
*
|
||||
* @param string $download_url
|
||||
* The path to the file to download
|
||||
* The path to the file to download.
|
||||
*
|
||||
* @return string
|
||||
* The filename that was downloaded, or NULL if the file could not be
|
||||
* downloaded.
|
||||
*/
|
||||
function _print_drush_download_file($download_url) {
|
||||
$wget_ret = drush_shell_exec("wget -nv --trust-server-names %s", $download_url);
|
||||
|
||||
if (!drush_get_context('DRUSH_SIMULATE')) {
|
||||
$wget_ret = drush_shell_exec("wget -nv --content-disposition %s", $download_url);
|
||||
if ($wget_ret) {
|
||||
// Get the filename of the saved file from the output
|
||||
// Get the filename of the saved file from the output.
|
||||
$wget_out = explode('"', array_shift(drush_shell_exec_output()));
|
||||
$filename = $wget_out[1];
|
||||
}
|
||||
@@ -83,13 +110,12 @@ function _print_drush_download_file($download_url) {
|
||||
|
||||
$curl_ret = drush_shell_exec("curl -s -L -o %s %s -w '%%{url_effective}'", $tempnam, $download_url);
|
||||
if ($curl_ret) {
|
||||
// File was donwloaded with the tempname
|
||||
|
||||
// Find the effective name
|
||||
// File was downloaded with the temporary name.
|
||||
// Find the effective name.
|
||||
$filename = explode('/', array_shift(drush_shell_exec_output()));
|
||||
$filename = array_pop($filename);
|
||||
|
||||
// Rename file from tempname to effective name
|
||||
// Rename file from tempname to effective name.
|
||||
if (!drush_op('rename', $tempnam, './' . $filename)) {
|
||||
$filename = $tempnam;
|
||||
}
|
||||
@@ -110,7 +136,7 @@ function _print_drush_download_file($download_url) {
|
||||
* Helper to extract the downloaded zip/tar archive.
|
||||
*
|
||||
* @param string $filename
|
||||
* filename of the file to extract
|
||||
* Filename of the file to extract.
|
||||
*
|
||||
* @return bool
|
||||
* TRUE on success, FALSE on failure
|
||||
@@ -119,28 +145,36 @@ function _print_drush_download_extract($filename) {
|
||||
$arch_ret = FALSE;
|
||||
|
||||
if (drush_op('is_file', $filename)) {
|
||||
switch (drush_op('mime_content_type', $filename)) {
|
||||
$mime_type = drush_op('mime_content_type', $filename);
|
||||
switch ($mime_type) {
|
||||
case 1:
|
||||
$arch_ret = TRUE;
|
||||
break;
|
||||
|
||||
case 'application/zip':
|
||||
// Decompress the zip archive
|
||||
// Decompress the zip archive.
|
||||
$arch_ret = drush_shell_exec('unzip -qq -o %s', $filename);
|
||||
// ZIP archives usually get the access rights wrong
|
||||
// ZIP archives usually get the access rights wrong.
|
||||
drush_log(dt('@filename is a Zip file. Check the access permissions of the extracted files.', array('@filename' => $filename)), 'warning');
|
||||
break;
|
||||
|
||||
case 'application/x-gzip':
|
||||
// Decompress the tar gz archive
|
||||
// Decompress the tar gz archive.
|
||||
$arch_ret = drush_shell_exec('tar xzf %s', $filename);
|
||||
break;
|
||||
|
||||
case 'application/x-bzip2':
|
||||
// Decompress the tar bz2 archive
|
||||
// Decompress the tar bz2 archive.
|
||||
$arch_ret = drush_shell_exec('tar xjf %s', $filename);
|
||||
break;
|
||||
|
||||
case 'application/x-xz':
|
||||
// Decompress the tar xz archive
|
||||
// Decompress the tar xz archive.
|
||||
$arch_ret = drush_shell_exec('tar xJf %s', $filename);
|
||||
break;
|
||||
|
||||
default:
|
||||
drush_log(dt('Unknown MIME type: @type', array('@type' => $mime_type)), 'error');
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Common functions used by several of the print modules
|
||||
* Common functions used by several of the print modules.
|
||||
*
|
||||
* @ingroup print
|
||||
*/
|
||||
@@ -29,18 +29,18 @@ function _print_scan_libs($lib, $mask) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback function for the preg_replace_callback replacing spaces with %20
|
||||
* Callback function for the preg_replace_callback replacing spaces with %20.
|
||||
*
|
||||
* Replace spaces in URLs with %20
|
||||
*
|
||||
* @param array $matches
|
||||
* array with the matched tag patterns, usually <a...>+text+</a>
|
||||
* Array with the matched tag patterns, usually <a...>+text+</a>.
|
||||
*
|
||||
* @return string
|
||||
* tag with re-written URL
|
||||
*/
|
||||
function _print_replace_spaces($matches) {
|
||||
// first, split the html into the different tag attributes
|
||||
// Split the html into the different tag attributes.
|
||||
$pattern = '!\s*(\w+\s*=\s*"(?:\\\"|[^"])*")\s*|\s*(\w+\s*=\s*\'(?:\\\\\'|[^\'])*\')\s*|\s*(\w+\s*=\s*\w+)\s*|\s+!';
|
||||
$attribs = preg_split($pattern, $matches[1], -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
|
||||
foreach ($attribs as $key => $value) {
|
||||
@@ -48,8 +48,8 @@ function _print_replace_spaces($matches) {
|
||||
}
|
||||
|
||||
$size = count($attribs);
|
||||
for ($i=1; $i < $size; $i++) {
|
||||
// If the attribute is href or src, we may need to rewrite the URL in the value
|
||||
for ($i = 1; $i < $size; $i++) {
|
||||
// If the attribute is href or src, we need to rewrite the URL in the value.
|
||||
if (preg_match('!^(?:href|src)\s*?=(.*)!i', $attribs[$i], $urls) > 0) {
|
||||
$url = trim($urls[1], " \t\n\r\0\x0B\"'");
|
||||
$new_url = str_replace(' ', '%20', $url);
|
||||
@@ -66,7 +66,7 @@ function _print_replace_spaces($matches) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert image paths to the file:// protocol
|
||||
* Convert image paths to the file:// protocol.
|
||||
*
|
||||
* In some Drupal setups, the use of the 'private' filesystem or Apache's
|
||||
* configuration prevent access to the images of the page. This function
|
||||
@@ -74,9 +74,9 @@ function _print_replace_spaces($matches) {
|
||||
* filesystem.
|
||||
*
|
||||
* @param string $html
|
||||
* contents of the post-processed template already with the node data
|
||||
* Contents of the post-processed template already with the node data.
|
||||
* @param bool $images_via_file
|
||||
* if TRUE, convert also files in the 'public' filesystem to local paths
|
||||
* If TRUE, convert also files in the 'public' filesystem to local paths.
|
||||
*
|
||||
* @return string
|
||||
* converted file names
|
||||
@@ -86,13 +86,13 @@ function _print_access_images_via_file($html, $images_via_file) {
|
||||
|
||||
$lang = (function_exists('language_negotiation_get_any') && language_negotiation_get_any('locale-url')) ? $language->language : '';
|
||||
|
||||
// Always convert private to local paths
|
||||
$pattern = "!(<img\s[^>]*?src\s*?=\s*?['\"]?)${base_url}/(?:(?:index.php)?\?q=)?(?:${lang}/)?system/files/([^>]*?>)!is";
|
||||
$replacement = '$1file://' . realpath(variable_get('file_private_path', '')) . '/$2';
|
||||
// Always convert private to local paths.
|
||||
$pattern = "!(<img\s[^>]*?src\s*?=\s*?['\"]?)${base_url}/(?:(?:index.php)?\?q=)?(?:${lang}/)?system/files/([^>\?]*)(?:\?itok=[a-zA-Z0-9\-_]{8})?([^>]*?>)!is";
|
||||
$replacement = '$1file://' . realpath(variable_get('file_private_path', '')) . '/$2$3';
|
||||
$html = preg_replace($pattern, $replacement, $html);
|
||||
if ($images_via_file) {
|
||||
$pattern = "!(<img\s[^>]*?src\s*?=\s*?['\"]?)${base_url}/(?:(?:index.php)?\?q=)?(?:${lang}/)?([^>]*?>)!is";
|
||||
$replacement = '$1file://' . dirname($_SERVER['SCRIPT_FILENAME']) . '/$2';
|
||||
$pattern = "!(<img\s[^>]*?src\s*?=\s*?['\"]?)${base_url}/(?:(?:index.php)?\?q=)?(?:${lang}/)?([^>\?]*)(?:\?itok=[a-zA-Z0-9\-_]{8})?([^>]*?>)!is";
|
||||
$replacement = '$1file://' . DRUPAL_ROOT . '/$2$3';
|
||||
$html = preg_replace($pattern, $replacement, $html);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user