X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FFileName.cpp;h=91b9a33cc4db809d17927a84737af8b7a5e7373d;hb=c23db901ece8b4e21121e43fc2562ac73e79fc98;hp=8909bcab345e9a91412a89b24ccea33478ec80aa;hpb=23c291bb6c85666662ff164d692623fef12c851a;p=lyx.git diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index 8909bcab34..91b9a33cc4 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -32,20 +32,6 @@ #include #include - -using std::map; -using std::string; -using std::ifstream; -using std::ostringstream; -using std::endl; - - -// FIXME: merge this -// -#include -#include -#include - #ifdef HAVE_SYS_TYPES_H # include #endif @@ -56,138 +42,103 @@ using std::endl; #include -// BOOST_POSIX or BOOST_WINDOWS specify which API to use. -# if !defined( BOOST_WINDOWS ) && !defined( BOOST_POSIX ) -# if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__) -# define BOOST_WINDOWS -# else -# define BOOST_POSIX -# endif -# endif - -#if defined (BOOST_WINDOWS) -# define WIN32_LEAN_AND_MEAN -# include -# undef min -# undef max -#endif - - -static bool copy_file(std::string const & source, std::string const & target, bool noclobber) -{ +using std::map; +using std::string; +using std::ifstream; +using std::ostringstream; +using std::endl; -#ifdef BOOST_POSIX - int const infile = ::open(source.c_str(), O_RDONLY); - if (infile == -1) - return false; +namespace lyx { +namespace support { - struct stat source_stat; - int const ret = ::fstat(infile, &source_stat); - if (ret == -1) { - //int err = errno; - ::close(infile); - } - int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC); +///////////////////////////////////////////////////////////////////// +// +// FileName::Private +// +///////////////////////////////////////////////////////////////////// - int const outfile = ::open(target.c_str(), flags, source_stat.st_mode); - if (outfile == -1) { - //int err = errno; - ::close(infile); - return false; - } +struct FileName::Private +{ + Private() {} - std::size_t const buf_sz = 32768; - char buf[buf_sz]; - ssize_t in = -1; - ssize_t out = -1; + Private(string const & abs_filename) : fi(toqstr(abs_filename)) + {} + /// + QFileInfo fi; +}; - while (true) { - in = ::read(infile, buf, buf_sz); - if (in == -1) { - break; - } else if (in == 0) { - break; - } else { - out = ::write(outfile, buf, in); - if (out == -1) { - break; - } - } - } +///////////////////////////////////////////////////////////////////// +// +// FileName +// +///////////////////////////////////////////////////////////////////// - //int err = errno; - ::close(infile); - ::close(outfile); +FileName::FileName() : d(new Private) +{ +} - if (in == -1 || out == -1) - return false; +FileName::FileName(string const & abs_filename) + : d(abs_filename.empty() ? new Private : new Private(abs_filename)) +{ + BOOST_ASSERT(empty() || d->fi.isAbsolute()); +#if defined(_WIN32) + BOOST_ASSERT(!contains(abs_filename, '\\')); #endif +} -#ifdef BOOST_WINDOWS - if (::CopyFile(source.c_str(), target.c_str(), noclobber) == 0) { - // CopyFile is probably not setting errno so this is most - // likely wrong. - return false; - } -#endif - return true; + +FileName::FileName(FileName const & rhs) : d(new Private) +{ + d->fi = rhs.d->fi; } -namespace lyx { -namespace support { +FileName & FileName::operator=(FileName const & rhs) +{ + d->fi = rhs.d->fi; + return *this; +} -///////////////////////////////////////////////////////////////////// -// -// FileName -// -///////////////////////////////////////////////////////////////////// +bool FileName::empty() const +{ + return d->fi.absoluteFilePath().isEmpty(); +} -FileName::FileName(string const & abs_filename) - : name_(abs_filename) +string FileName::absFilename() const { - BOOST_ASSERT(empty() || absolutePath(name_)); -#if defined(_WIN32) - BOOST_ASSERT(!contains(name_, '\\')); -#endif + return fromqstr(d->fi.absoluteFilePath()); } void FileName::set(string const & name) { - name_ = name; - BOOST_ASSERT(absolutePath(name_)); + d->fi.setFile(toqstr(name)); + BOOST_ASSERT(d->fi.isAbsolute()); #if defined(_WIN32) - BOOST_ASSERT(!contains(name_, '\\')); + BOOST_ASSERT(!contains(name, '\\')); #endif } void FileName::erase() { - name_.erase(); + d->fi = QFileInfo(); } -bool FileName::copyTo(FileName const & name, bool noclobber) const +bool FileName::copyTo(FileName const & name) const { - try { - copy_file(toFilesystemEncoding(), name.toFilesystemEncoding(), noclobber); - return true; - } - catch (...) { - } - return false; + return QFile::copy(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath()); } string FileName::toFilesystemEncoding() const { - QByteArray const encoded = QFile::encodeName(toqstr(name_)); + QByteArray const encoded = QFile::encodeName(d->fi.absoluteFilePath()); return string(encoded.begin(), encoded.end()); } @@ -201,39 +152,37 @@ FileName FileName::fromFilesystemEncoding(string const & name) bool FileName::exists() const { - return QFileInfo(toqstr(name_)).exists(); + return d->fi.exists(); } bool FileName::isSymLink() const { - return QFileInfo(toqstr(name_)).isSymLink(); + return d->fi.isSymLink(); } bool FileName::isFileEmpty() const { - return QFileInfo(toqstr(name_)).size() == 0; + return d->fi.size() == 0; } bool FileName::isDirectory() const { - return QFileInfo(toqstr(name_)).isDir(); + return d->fi.isDir(); } bool FileName::isReadOnly() const { - QFileInfo const fi(toqstr(name_)); - return fi.isReadable() && !fi.isWritable(); + return d->fi.isReadable() && !d->fi.isWritable(); } bool FileName::isReadableDirectory() const { - QFileInfo const fi(toqstr(name_)); - return fi.isDir() && fi.isReadable(); + return d->fi.isDir() && d->fi.isReadable(); } @@ -251,15 +200,13 @@ FileName FileName::onlyPath() const bool FileName::isReadableFile() const { - QFileInfo const fi(toqstr(name_)); - return fi.isFile() && fi.isReadable(); + return d->fi.isFile() && d->fi.isReadable(); } bool FileName::isWritable() const { - QFileInfo const fi(toqstr(name_)); - return fi.isWritable(); + return d->fi.isWritable(); } @@ -285,7 +232,7 @@ FileName FileName::tempName(FileName const & dir, std::string const & mask) std::time_t FileName::lastModified() const { - return QFileInfo(toqstr(name_)).lastModified().toTime_t(); + return d->fi.lastModified().toTime_t(); } @@ -293,31 +240,38 @@ static bool rmdir(QFileInfo const & fi) { QDir dir(fi.absoluteFilePath()); QFileInfoList list = dir.entryInfoList(); + bool global_success = true; for (int i = 0; i < list.size(); ++i) { if (list.at(i).fileName() == ".") continue; if (list.at(i).fileName() == "..") continue; + bool success; if (list.at(i).isDir()) { LYXERR(Debug::FILES, "Erasing dir " << fromqstr(list.at(i).absoluteFilePath()) << endl); - if (!rmdir(list.at(i))) - return false; + success = rmdir(list.at(i)); } else { LYXERR(Debug::FILES, "Erasing file " << fromqstr(list.at(i).absoluteFilePath()) << endl); - dir.remove(list.at(i).fileName()); + success = dir.remove(list.at(i).fileName()); + } + if (!success) { + global_success = false; + lyxerr << "Could not delete " + << fromqstr(list.at(i).absoluteFilePath()) << "." << endl; } } QDir parent = fi.absolutePath(); - return parent.rmdir(fi.fileName()); + global_success |= parent.rmdir(fi.fileName()); + return global_success; } bool FileName::destroyDirectory() const { - bool const success = rmdir(QFileInfo(toqstr(name_))); + bool const success = rmdir(d->fi); if (!success) lyxerr << "Could not delete " << *this << "." << endl; @@ -332,6 +286,42 @@ bool FileName::createDirectory(int permission) const } +std::vector FileName::dirList(std::string const & ext) +{ + std::vector dirlist; + if (!exists() || !isDirectory()) { + lyxerr << "FileName::dirList(): Directory \"" << absFilename() + << "\" does not exist!" << endl; + return dirlist; + } + + QDir dir(d->fi.absoluteFilePath()); + + if (!ext.empty()) { + QString filter; + switch (ext[0]) { + case '.': filter = "*" + toqstr(ext); break; + case '*': filter = toqstr(ext); break; + default: filter = "*." + toqstr(ext); + } + dir.setNameFilters(QStringList(filter)); + LYXERR(Debug::FILES, "FileName::dirList(): filtering on extension " + << fromqstr(filter) << " is requested." << endl); + } + + QFileInfoList list = dir.entryInfoList(); + for (int i = 0; i < list.size(); ++i) { + FileName fi; + fi.d->fi = list.at(i); + dirlist.push_back(fi); + LYXERR(Debug::FILES, "FileName::dirList(): found file " + << fi.absFilename() << endl); + } + + return dirlist; +} + + docstring FileName::displayName(int threshold) const { return makeDisplayPath(absFilename(), threshold); @@ -592,14 +582,14 @@ DocFileName::DocFileName(FileName const & abs_filename, bool save_abs) void DocFileName::set(string const & name, string const & buffer_path) { save_abs_path_ = absolutePath(name); - name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path).absFilename(); + FileName::set(save_abs_path_ ? name : makeAbsPath(name, buffer_path).absFilename()); zipped_valid_ = false; } void DocFileName::erase() { - name_.erase(); + FileName::erase(); zipped_valid_ = false; } @@ -607,14 +597,13 @@ void DocFileName::erase() string const DocFileName::relFilename(string const & path) const { // FIXME UNICODE - return to_utf8(makeRelPath(from_utf8(name_), from_utf8(path))); + return to_utf8(makeRelPath(qstring_to_ucs4(d->fi.absoluteFilePath()), from_utf8(path))); } string const DocFileName::outputFilename(string const & path) const { - // FIXME UNICODE - return save_abs_path_ ? name_ : to_utf8(makeRelPath(from_utf8(name_), from_utf8(path))); + return save_abs_path_ ? absFilename() : relFilename(path); } @@ -624,14 +613,15 @@ string const DocFileName::mangledFilename(std::string const & dir) const // filename returns the same mangled name. typedef map MangledMap; static MangledMap mangledNames; - MangledMap::const_iterator const it = mangledNames.find(name_); + MangledMap::const_iterator const it = mangledNames.find(absFilename()); if (it != mangledNames.end()) return (*it).second; + string const name = absFilename(); // Now the real work - string mname = os::internal_path(name_); + string mname = os::internal_path(name); // Remove the extension. - mname = changeExtension(name_, string()); + mname = changeExtension(name, string()); // The mangled name must be a valid LaTeX name. // The list of characters to keep is probably over-restrictive, // but it is not really a problem. @@ -646,7 +636,7 @@ string const DocFileName::mangledFilename(std::string const & dir) const while ((pos = mname.find_first_not_of(keep, pos)) != string::npos) mname[pos++] = '_'; // Add the extension back on - mname = changeExtension(mname, getExtension(name_)); + mname = changeExtension(mname, getExtension(name)); // Prepend a counter to the filename. This is necessary to make // the mangled name unique. @@ -674,7 +664,7 @@ string const DocFileName::mangledFilename(std::string const & dir) const } } - mangledNames[name_] = mname; + mangledNames[absFilename()] = mname; return mname; } @@ -691,7 +681,7 @@ bool DocFileName::isZipped() const string const DocFileName::unzippedFilename() const { - return unzippedFileName(name_); + return unzippedFileName(absFilename()); } @@ -709,6 +699,3 @@ bool operator!=(DocFileName const & lhs, DocFileName const & rhs) } // namespace support } // namespace lyx - - -