Quote graphics conversion commands correctly.

[lyx.git] / src / graphics / GraphicsCacheItem.C

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 02c730d37af824a07c57ca159245336a98009590..0133bd6a06ffa73d532d1eb747cf86fa226ee440 100644 (file)
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -4,37 +4,50 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "GraphicsCacheItem.h"
-#include "GraphicsImage.h"
 #include "GraphicsConverter.h"
-
-#include "support/FileMonitor.h"
+#include "GraphicsImage.h"
 
 #include "debug.h"
+#include "format.h"
 
-#include "support/LAssert.h"
 #include "support/filetools.h"
+#include "support/FileMonitor.h"
 #include "support/lyxlib.h"
 
-#include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
 
-using namespace lyx::support;
+
+namespace support = lyx::support;
+
+using support::ChangeExtension;
+using support::FileMonitor;
+using support::IsFileReadable;
+using support::MakeDisplayPath;
+using support::OnlyFilename;
+using support::tempName;
+using support::unlink;
+using support::unzipFile;
+using support::unzippedFileName;
+using support::zippedFile;
 
 using std::endl;
+using std::string;
 
-namespace grfx {
 
-struct CacheItem::Impl : public boost::signals::trackable {
+namespace lyx {
+namespace graphics {
+
+class CacheItem::Impl : public boost::signals::trackable {
+public:
 
        ///
        Impl(string const & file);
@@ -67,7 +80,7 @@ struct CacheItem::Impl : public boost::signals::trackable {
 
        /** Get a notification when the image loading is done.
         *  Connected to a signal on_finish_ which is passed to
-        *  grfx::Image::loadImage.
+        *  lyx::graphics::Image::loadImage.
         */
        void imageLoaded(bool);
 
@@ -110,7 +123,7 @@ struct CacheItem::Impl : public boost::signals::trackable {
        ImageStatus status_;
 
        /// This signal is emitted when the image loading status changes.
-       boost::signal0<void> statusChanged;
+       boost::signal<void()> statusChanged;
 
        /// The connection to the signal Image::finishedLoading
        boost::signals::connection cl_;
@@ -311,18 +324,19 @@ void CacheItem::Impl::imageLoaded(bool success)
 }
 
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 
 namespace {
 
 string const findTargetFormat(string const & from)
 {
-       typedef grfx::Image::FormatList FormatList;
-       FormatList const formats = grfx::Image::loadableFormats();
+       typedef lyx::graphics::Image::FormatList FormatList;
+       FormatList const formats = lyx::graphics::Image::loadableFormats();
 
        // There must be a format to load from.
-       Assert(!formats.empty());
+       BOOST_ASSERT(!formats.empty());
 
        // First ascertain if we can load directly with no conversion
        FormatList::const_iterator it  = formats.begin();
@@ -335,7 +349,7 @@ string const findTargetFormat(string const & from)
        // So, we have to convert to a loadable format. Can we?
        it = formats.begin();
        for (; it != end; ++it) {
-               if (grfx::Converter::isReachable(from, *it))
+               if (lyx::graphics::Converter::isReachable(from, *it))
                        return *it;
                else
                        lyxerr[Debug::GRAPHICS]
@@ -351,7 +365,8 @@ string const findTargetFormat(string const & from)
 } // anon namespace
 
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 void CacheItem::Impl::convertToDisplayFormat()
 {
@@ -368,15 +383,32 @@ void CacheItem::Impl::convertToDisplayFormat()
        }
 
        // Make a local copy in case we unzip it
-       string const filename = zippedFile(filename_) ?
-               unzipFile(filename_) : filename_;
+       string filename;
+       if ((zipped_ = zippedFile(filename_))) {
+               unzipped_filename_ = tempName(string(), filename_);
+               if (unzipped_filename_.empty()) {
+                       setStatus(ErrorConverting);
+                       lyxerr[Debug::GRAPHICS]
+                               << "\tCould not create temporary file." << endl;
+                       return;
+               }
+               filename = unzipFile(filename_, unzipped_filename_);
+       } else
+               filename = filename_;
+
        string const displayed_filename = MakeDisplayPath(filename_);
        lyxerr[Debug::GRAPHICS] << "[GrahicsCacheItem::convertToDisplayFormat]\n"
                << "\tAttempting to convert image file: " << filename
                << "\n\twith displayed filename: " << displayed_filename
                << endl;
 
-       string from = getExtFromContents(filename);
+       string const from = formats.getFormatFromFile(filename);
+       if (from.empty()) {
+               setStatus(ErrorConverting);
+               lyxerr[Debug::GRAPHICS]
+                       << "\tCould not determine file format." << endl;
+               return;
+       }
        lyxerr[Debug::GRAPHICS]
                << "\n\tThe file contains " << from << " format data." << endl;
        string const to = findTargetFormat(from);
@@ -399,6 +431,7 @@ void CacheItem::Impl::convertToDisplayFormat()
        remove_loaded_file_ = true;
 
        // Remove the temp file, we only want the name...
+       // FIXME: This is unsafe!
        unlink(to_file_base);
 
        // Connect a signal to this->imageConverted and pass this signal to
@@ -409,4 +442,5 @@ void CacheItem::Impl::convertToDisplayFormat()
        converter_->startConversion();
 }
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx