X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FFileName.cpp;h=929c4165bebd541bead6ce6e7a6a61774e12f89d;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=a0ad86da69db98f054a28fada191287c8d7de0b9;hpb=3dba00246c258367de80bc7cbae28d30a8bf4612;p=lyx.git diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index a0ad86da69..929c4165be 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -17,7 +17,7 @@ #include "support/filetools.h" #include "support/lassert.h" #include "support/lstrings.h" -#include "support/qstring_helpers.h" +#include "support/mutex.h" #include "support/os.h" #include "support/Package.h" #include "support/qstring_helpers.h" @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -98,13 +97,7 @@ struct FileName::Private /// inline void refresh() { -// There seems to be a bug in Qt >= 4.2.0 and < 4.5.0, that causes problems with -// QFileInfo::refresh() on *nix. So we recreate the object in that case. -#if defined(_WIN32) || (QT_VERSION >= 0x040500) fi.refresh(); -#else - fi = QFileInfo(fi.absoluteFilePath()); -#endif } @@ -137,7 +130,7 @@ FileName::FileName(string const & abs_filename) : d(abs_filename.empty() ? new Private : new Private(abs_filename)) { //LYXERR(Debug::FILES, "FileName(" << abs_filename << ')'); - LASSERT(empty() || isAbsolute(d->name), /**/); + LATTEST(empty() || isAbsolute(d->name)); } @@ -200,7 +193,7 @@ void FileName::set(string const & name) d->fi.setFile(toqstr(name)); d->name = fromqstr(d->fi.absoluteFilePath()); //LYXERR(Debug::FILES, "FileName::set(" << name << ')'); - LASSERT(empty() || isAbsolute(d->name), /**/); + LATTEST(empty() || isAbsolute(d->name)); } @@ -212,7 +205,7 @@ void FileName::set(FileName const & rhs, string const & suffix) d->fi.setFile(QDir(rhs.d->fi.absoluteFilePath()), toqstr(suffix)); d->name = fromqstr(d->fi.absoluteFilePath()); //LYXERR(Debug::FILES, "FileName::set(" << d->name << ')'); - LASSERT(empty() || isAbsolute(d->name), /**/); + LATTEST(empty() || isAbsolute(d->name)); } @@ -223,9 +216,26 @@ void FileName::erase() } -bool FileName::copyTo(FileName const & name) const +bool FileName::copyTo(FileName const & name, bool keepsymlink) const +{ + FileNameSet visited; + return copyTo(name, keepsymlink, visited); +} + + +bool FileName::copyTo(FileName const & name, bool keepsymlink, + FileName::FileNameSet & visited) const { - LYXERR(Debug::FILES, "Copying " << name); + LYXERR(Debug::FILES, "Copying " << name << " keep symlink: " << keepsymlink); + if (keepsymlink && name.isSymLink()) { + visited.insert(*this); + FileName const target(fromqstr(name.d->fi.symLinkTarget())); + if (visited.find(target) != visited.end()) { + LYXERR(Debug::FILES, "Found circular symlink: " << target); + return false; + } + return copyTo(target, true); + } QFile::remove(name.d->fi.absoluteFilePath()); bool success = QFile::copy(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath()); if (!success) @@ -237,6 +247,7 @@ bool FileName::copyTo(FileName const & name) const bool FileName::renameTo(FileName const & name) const { + LYXERR(Debug::FILES, "Renaming " << name << " as " << *this); bool success = QFile::rename(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath()); if (!success) LYXERR0("Could not rename file " << *this << " to " << name); @@ -246,6 +257,7 @@ bool FileName::renameTo(FileName const & name) const bool FileName::moveTo(FileName const & name) const { + LYXERR(Debug::FILES, "Moving " << name << " to " << *this); QFile::remove(name.d->fi.absoluteFilePath()); bool success = QFile::rename(d->fi.absoluteFilePath(), @@ -306,6 +318,9 @@ bool FileName::isSymLink() const } +//QFileInfo caching info might fool this test if file was changed meanwhile. +//refresh() helps, but we don't want to put it blindly here, because it might +//trigger slowdown on networked file systems. bool FileName::isFileEmpty() const { LASSERT(!empty(), return true); @@ -367,6 +382,19 @@ FileName FileName::onlyPath() const } +FileName FileName::parentPath() const +{ + FileName path; + // return empty path for parent of root dir + // parent of empty path is empty too + if (empty() || d->fi.isRoot()) + return path; + path.d->fi.setFile(d->fi.path()); + path.d->name = fromqstr(path.d->fi.absoluteFilePath()); + return path; +} + + bool FileName::isReadableFile() const { return !empty() && d->fi.isFile() && d->fi.isReadable(); @@ -428,34 +456,6 @@ FileNameList FileName::dirList(string const & ext) const } -static string createTempFile(QString const & mask) -{ - QTemporaryFile qt_tmp(mask); - if (qt_tmp.open()) { - string const temp_file = fromqstr(qt_tmp.fileName()); - LYXERR(Debug::FILES, "Temporary file `" << temp_file << "' created."); - return temp_file; - } - LYXERR(Debug::FILES, "Unable to create temporary file with following template: " - << qt_tmp.fileTemplate()); - return string(); -} - - -FileName FileName::tempName(FileName const & temp_dir, string const & mask) -{ - QFileInfo tmp_fi(QDir(temp_dir.d->fi.absoluteFilePath()), toqstr(mask)); - LYXERR(Debug::FILES, "Temporary file in " << tmp_fi.absoluteFilePath()); - return FileName(createTempFile(tmp_fi.absoluteFilePath())); -} - - -FileName FileName::tempName(string const & mask) -{ - return tempName(package().temp_dir(), mask); -} - - FileName FileName::getcwd() { // return makeAbsPath("."); would create an infinite loop @@ -492,6 +492,12 @@ bool FileName::chdir() const } +bool FileName::link(FileName const & name) const +{ + return QFile::link(toqstr(absFileName()), toqstr(name.absFileName())); +} + + unsigned long checksum_ifstream_fallback(char const * file) { unsigned long result = 0; @@ -716,7 +722,7 @@ docstring FileName::displayName(int threshold) const docstring FileName::fileContents(string const & encoding) const { if (!isReadableFile()) { - LYXERR0("File '" << *this << "' is not redable!"); + LYXERR0("File '" << *this << "' is not readable!"); return docstring(); } @@ -739,7 +745,11 @@ docstring FileName::fileContents(string const & encoding) const if (encoding.empty() || encoding == "UTF-8") s = QString::fromUtf8(contents.data()); else if (encoding == "ascii") +#if (QT_VERSION < 0x050000) s = QString::fromAscii(contents.data()); +#else + s = QString::fromLatin1(contents.data()); +#endif else if (encoding == "local8bit") s = QString::fromLocal8Bit(contents.data()); else if (encoding == "latin1") @@ -769,192 +779,6 @@ void FileName::changeExtension(string const & extension) } -string FileName::guessFormatFromContents() const -{ - // the different filetypes and what they contain in one of the first lines - // (dots are any characters). (Herbert 20020131) - // AGR Grace... - // BMP BM... - // EPS %!PS-Adobe-3.0 EPSF... - // FIG #FIG... - // FITS ...BITPIX... - // GIF GIF... - // JPG JFIF - // PDF %PDF-... - // PNG .PNG... - // PBM P1... or P4 (B/W) - // PGM P2... or P5 (Grayscale) - // PPM P3... or P6 (color) - // PS %!PS-Adobe-2.0 or 1.0, no "EPSF"! - // SGI \001\332... (decimal 474) - // TGIF %TGIF... - // TIFF II... or MM... - // XBM ..._bits[]... - // XPM /* XPM */ sometimes missing (f.ex. tgif-export) - // ...static char *... - // XWD \000\000\000\151 (0x00006900) decimal 105 - // - // GZIP \037\213 http://www.ietf.org/rfc/rfc1952.txt - // ZIP PK... http://www.halyava.ru/document/ind_arch.htm - // Z \037\235 UNIX compress - - // paranoia check - if (empty() || !isReadableFile()) - return string(); - - ifstream ifs(toFilesystemEncoding().c_str()); - if (!ifs) - // Couldn't open file... - return string(); - - // gnuzip - static string const gzipStamp = "\037\213"; - - // PKZIP - static string const zipStamp = "PK"; - - // ZIP containers (koffice, openoffice.org etc). - static string const nonzipStamp = "\008\0\0\0mimetypeapplication/"; - - // compress - static string const compressStamp = "\037\235"; - - // Maximum strings to read - int const max_count = 50; - int count = 0; - - string str; - string format; - bool firstLine = true; - while ((count++ < max_count) && format.empty()) { - if (ifs.eof()) { - LYXERR(Debug::GRAPHICS, "filetools(getFormatFromContents)\n" - << "\tFile type not recognised before EOF!"); - break; - } - - getline(ifs, str); - string const stamp = str.substr(0, 2); - if (firstLine && str.size() >= 2) { - // at first we check for a zipped file, because this - // information is saved in the first bytes of the file! - // also some graphic formats which save the information - // in the first line, too. - if (prefixIs(str, gzipStamp)) { - format = "gzip"; - - } else if (stamp == zipStamp && - !contains(str, nonzipStamp)) { - format = "zip"; - - } else if (stamp == compressStamp) { - format = "compress"; - - // the graphics part - } else if (stamp == "BM") { - format = "bmp"; - - } else if (stamp == "\001\332") { - format = "sgi"; - - // PBM family - // Don't need to use str.at(0), str.at(1) because - // we already know that str.size() >= 2 - } else if (str[0] == 'P') { - switch (str[1]) { - case '1': - case '4': - format = "pbm"; - break; - case '2': - case '5': - format = "pgm"; - break; - case '3': - case '6': - format = "ppm"; - } - break; - - } else if ((stamp == "II") || (stamp == "MM")) { - format = "tiff"; - - } else if (prefixIs(str,"%TGIF")) { - format = "tgif"; - - } else if (prefixIs(str,"#FIG")) { - format = "fig"; - - } else if (prefixIs(str,"GIF")) { - format = "gif"; - - } else if (str.size() > 3) { - int const c = ((str[0] << 24) & (str[1] << 16) & - (str[2] << 8) & str[3]); - if (c == 105) { - format = "xwd"; - } - } - - firstLine = false; - } - - if (!format.empty()) - break; - else if (contains(str,"EPSF")) - // dummy, if we have wrong file description like - // %!PS-Adobe-2.0EPSF" - format = "eps"; - - else if (contains(str, "Grace")) - format = "agr"; - - else if (contains(str, "JFIF")) - format = "jpg"; - - else if (contains(str, "%PDF")) - format = "pdf"; - - else if (contains(str, "PNG")) - format = "png"; - - else if (contains(str, "%!PS-Adobe")) { - // eps or ps - ifs >> str; - if (contains(str,"EPSF")) - format = "eps"; - else - format = "ps"; - } - - else if (contains(str, "_bits[]")) - format = "xbm"; - - else if (contains(str, "XPM") || contains(str, "static char *")) - format = "xpm"; - - else if (contains(str, "BITPIX")) - format = "fits"; - } - - if (!format.empty()) { - LYXERR(Debug::GRAPHICS, "Recognised Fileformat: " << format); - return format; - } - - LYXERR(Debug::GRAPHICS, "filetools(getFormatFromContents)\n" - << "\tCouldn't find a known format!"); - return string(); -} - - -bool FileName::isZippedFile() const -{ - string const type = guessFormatFromContents(); - return contains("gzip zip compress", type) && !type.empty(); -} - - docstring const FileName::relPath(string const & path) const { // FIXME UNICODE @@ -1054,12 +878,12 @@ DocFileName::DocFileName() DocFileName::DocFileName(string const & abs_filename, bool save_abs) - : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false) + : FileName(abs_filename), save_abs_path_(save_abs) {} DocFileName::DocFileName(FileName const & abs_filename, bool save_abs) - : FileName(abs_filename), save_abs_path_(save_abs), zipped_valid_(false) + : FileName(abs_filename), save_abs_path_(save_abs) {} @@ -1070,14 +894,12 @@ void DocFileName::set(string const & name, string const & buffer_path) FileName::set(name); else FileName::set(makeAbsPath(name, buffer_path).absFileName()); - zipped_valid_ = false; } void DocFileName::erase() { FileName::erase(); - zipped_valid_ = false; } @@ -1096,10 +918,15 @@ string DocFileName::outputFileName(string const & path) const string DocFileName::mangledFileName(string const & dir) const { + // Concurrent access to these variables is possible. + // We need to make sure that every DocFileName instance for a given // filename returns the same mangled name. typedef map MangledMap; static MangledMap mangledNames; + static Mutex mangledMutex; + // this locks both access to mangledNames and counter below + Mutex::Locker lock(&mangledMutex); MangledMap::const_iterator const it = mangledNames.find(absFileName()); if (it != mangledNames.end()) return (*it).second; @@ -1156,16 +983,6 @@ string DocFileName::mangledFileName(string const & dir) const } -bool DocFileName::isZipped() const -{ - if (!zipped_valid_) { - zipped_ = isZippedFile(); - zipped_valid_ = true; - } - return zipped_; -} - - string DocFileName::unzippedFileName() const { return support::unzippedFileName(absFileName());