X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FFileName.cpp;h=f0489309d549ae44a61df42c888225eb23eadfe5;hb=4e38cf152430c6293319642099f162299acde922;hp=5ba2af2524ae62eae10d5ac38a2a5bf110246b03;hpb=220f0f9f5ba510a9f1e30315b1f44401c1b92484;p=lyx.git diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index 5ba2af2524..f0489309d5 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -98,13 +98,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 +131,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)); } @@ -183,7 +177,7 @@ bool FileName::isAbsolute(string const & name) } -string FileName::absFilename() const +string FileName::absFileName() const { return d->name; } @@ -191,7 +185,7 @@ string FileName::absFilename() const string FileName::realPath() const { - return os::real_path(absFilename()); + return os::real_path(absFileName()); } @@ -200,7 +194,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 +206,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)); } @@ -277,10 +271,11 @@ string FileName::toFilesystemEncoding() const } -string FileName::toSafeFilesystemEncoding() const +string FileName::toSafeFilesystemEncoding(os::file_access how) const { // This will work on Windows for non ascii file names. - QString const safe_path = toqstr(os::safe_internal_path(absFilename())); + QString const safe_path = + toqstr(os::safe_internal_path(absFileName(), how)); QByteArray const encoded = QFile::encodeName(safe_path); return string(encoded.begin(), encoded.end()); } @@ -366,6 +361,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(); @@ -429,7 +437,13 @@ FileNameList FileName::dirList(string const & ext) const static string createTempFile(QString const & mask) { - QTemporaryFile qt_tmp(mask); + // FIXME: This is not safe. QTemporaryFile creates a file in open(), + // but the file is deleted when qt_tmp goes out of scope. + // Therefore the next call to createTempFile() may create the + // same file again. To make this safe the QTemporaryFile object + // needs to be kept for the whole life time of the temp file name. + // This can be achieved by using the TempFile class. + QTemporaryFile qt_tmp(mask + ".XXXXXXXXXXXX"); if (qt_tmp.open()) { string const temp_file = fromqstr(qt_tmp.fileName()); LYXERR(Debug::FILES, "Temporary file `" << temp_file << "' created."); @@ -491,17 +505,33 @@ bool FileName::chdir() const } +unsigned long checksum_ifstream_fallback(char const * file) +{ + unsigned long result = 0; + //LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)"); + ifstream ifs(file, ios_base::in | ios_base::binary); + if (!ifs) + return result; + + istreambuf_iterator beg(ifs); + istreambuf_iterator end; + boost::crc_32_type crc; + crc = for_each(beg, end, crc); + result = crc.checksum(); + return result; +} + unsigned long FileName::checksum() const { unsigned long result = 0; if (!exists()) { - //LYXERR0("File \"" << absFilename() << "\" does not exist!"); + //LYXERR0("File \"" << absFileName() << "\" does not exist!"); return result; } // a directory may be passed here so we need to test it. (bug 3622) if (isDirectory()) { - LYXERR0('"' << absFilename() << "\" is a directory!"); + LYXERR0('"' << absFileName() << "\" is a directory!"); return result; } @@ -542,7 +572,11 @@ unsigned long FileName::checksum() const return result; struct stat info; - fstat(fd, &info); + if (fstat(fd, &info)){ + // fstat fails on samba shares (bug 5891) + close(fd); + return checksum_ifstream_fallback(file); + } void * mm = mmap(0, info.st_size, PROT_READ, MAP_PRIVATE, fd, 0); @@ -563,22 +597,11 @@ unsigned long FileName::checksum() const close(fd); #else // no SUM_WITH_MMAP - - //LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)"); - ifstream ifs(file, ios_base::in | ios_base::binary); - if (!ifs) - return result; - - istreambuf_iterator beg(ifs); - istreambuf_iterator end; - boost::crc_32_type crc; - crc = for_each(beg, end, crc); - result = crc.checksum(); - + result = checksum_ifstream_fallback(file); #endif // SUM_WITH_MMAP #endif // QT_VERSION - LYXERR(Debug::FILES, "Checksumming \"" << absFilename() << "\" " + LYXERR(Debug::FILES, "Checksumming \"" << absFileName() << "\" " << result << " lasted " << t.elapsed() << " ms."); return result; } @@ -699,14 +722,14 @@ docstring const FileName::absoluteFilePath() const docstring FileName::displayName(int threshold) const { - return makeDisplayPath(absFilename(), threshold); + return makeDisplayPath(absFileName(), threshold); } docstring FileName::fileContents(string const & encoding) const { if (!isReadableFile()) { - LYXERR0("File '" << *this << "' is not redable!"); + LYXERR0("File '" << *this << "' is not readable!"); return docstring(); } @@ -729,7 +752,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") @@ -742,7 +769,7 @@ docstring FileName::fileContents(string const & encoding) const void FileName::changeExtension(string const & extension) { // FIXME: use Qt native methods... - string const oldname = absFilename(); + string const oldname = absFileName(); string::size_type const last_slash = oldname.rfind('/'); string::size_type last_dot = oldname.rfind('.'); if (last_dot < last_slash && last_slash != string::npos) @@ -759,192 +786,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"; - - // 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) { - 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"; - } - - // Dia knows also compressed form - if ((format == "gzip") && (!compare_ascii_no_case(extension(), "dia"))) - format="dia"; - - 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 @@ -965,8 +806,8 @@ bool equivalent(FileName const & l, FileName const & r) // * Long and short file names that refer to the same file on Windows are // treated as if they referred to different files. // This is supposed to be fixed for Qt5. - FileName const lhs(os::internal_path(l.absFilename())); - FileName const rhs(os::internal_path(r.absFilename())); + FileName const lhs(os::internal_path(l.absFileName())); + FileName const rhs(os::internal_path(r.absFileName())); if (lhs.empty()) // QFileInfo::operator==() returns false if the two QFileInfo are empty. @@ -1001,9 +842,9 @@ bool equivalent(FileName const & l, FileName const & r) bool operator==(FileName const & lhs, FileName const & rhs) { return os::isFilesystemCaseSensitive() - ? lhs.absFilename() == rhs.absFilename() - : !QString::compare(toqstr(lhs.absFilename()), - toqstr(rhs.absFilename()), Qt::CaseInsensitive); + ? lhs.absFileName() == rhs.absFileName() + : !QString::compare(toqstr(lhs.absFileName()), + toqstr(rhs.absFileName()), Qt::CaseInsensitive); } @@ -1015,19 +856,19 @@ bool operator!=(FileName const & lhs, FileName const & rhs) bool operator<(FileName const & lhs, FileName const & rhs) { - return lhs.absFilename() < rhs.absFilename(); + return lhs.absFileName() < rhs.absFileName(); } bool operator>(FileName const & lhs, FileName const & rhs) { - return lhs.absFilename() > rhs.absFilename(); + return lhs.absFileName() > rhs.absFileName(); } ostream & operator<<(ostream & os, FileName const & filename) { - return os << filename.absFilename(); + return os << filename.absFileName(); } @@ -1044,12 +885,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) {} @@ -1059,42 +900,40 @@ void DocFileName::set(string const & name, string const & buffer_path) if (save_abs_path_) FileName::set(name); else - FileName::set(makeAbsPath(name, buffer_path).absFilename()); - zipped_valid_ = false; + FileName::set(makeAbsPath(name, buffer_path).absFileName()); } void DocFileName::erase() { FileName::erase(); - zipped_valid_ = false; } -string DocFileName::relFilename(string const & path) const +string DocFileName::relFileName(string const & path) const { // FIXME UNICODE return to_utf8(relPath(path)); } -string DocFileName::outputFilename(string const & path) const +string DocFileName::outputFileName(string const & path) const { - return save_abs_path_ ? absFilename() : relFilename(path); + return save_abs_path_ ? absFileName() : relFileName(path); } -string DocFileName::mangledFilename(string const & dir) const +string DocFileName::mangledFileName(string const & dir) const { // We need to make sure that every DocFileName instance for a given // filename returns the same mangled name. typedef map MangledMap; static MangledMap mangledNames; - MangledMap::const_iterator const it = mangledNames.find(absFilename()); + MangledMap::const_iterator const it = mangledNames.find(absFileName()); if (it != mangledNames.end()) return (*it).second; - string const name = absFilename(); + string const name = absFileName(); // Now the real work string mname = os::internal_path(name); // Remove the extension. @@ -1108,7 +947,7 @@ string DocFileName::mangledFilename(string const & dir) const // in the name. static string const keep = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "+,-0123456789;="; + "+-0123456789;="; string::size_type pos = 0; while ((pos = mname.find_first_not_of(keep, pos)) != string::npos) mname[pos++] = '_'; @@ -1141,24 +980,14 @@ string DocFileName::mangledFilename(string const & dir) const } } - mangledNames[absFilename()] = mname; + mangledNames[absFileName()] = mname; return mname; } -bool DocFileName::isZipped() const -{ - if (!zipped_valid_) { - zipped_ = isZippedFile(); - zipped_valid_ = true; - } - return zipped_; -} - - -string DocFileName::unzippedFilename() const +string DocFileName::unzippedFileName() const { - return unzippedFileName(absFilename()); + return support::unzippedFileName(absFileName()); }