Refactor|FS: Added a method for getting file extension

skyjake · Jun 2, 2016 · 2b25aca · 2b25aca
1 parent 8bf5a2c
commit 2b25aca
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 11 deletions.
diff --git a/doomsday/apps/libdoomsday/src/resource/bundles.cpp b/doomsday/apps/libdoomsday/src/resource/bundles.cpp
@@ -193,7 +193,7 @@ Bundles::MatchResult Bundles::match(DataBundle const &bundle) const
 
         // Additional criteria for recognizing WADs.
         if (bundle.format() == DataBundle::Iwad ||
-           bundle.format() == DataBundle::Pwad)
+            bundle.format() == DataBundle::Pwad)
         {
             String lumpDirCRC32 = def->keyValue(QStringLiteral("lumpDirCRC32"));
             if (!lumpDirCRC32.isEmpty())

diff --git a/doomsday/apps/libdoomsday/src/savedsession.cpp b/doomsday/apps/libdoomsday/src/savedsession.cpp
@@ -392,7 +392,7 @@ File *SavedSession::Interpreter::interpretFile(File *sourceData) const
         if (ZipArchive::recognize(*sourceData))
         {
             // It is a ZIP archive: we will represent it as a folder.
-            if (sourceData->name().fileNameExtension() == ".save")
+            if (sourceData->extension() == ".save")
             {
                 /// @todo fixme: Don't assume this is a save package.
                 LOG_RES_VERBOSE("Interpreted %s as a SavedSession") << sourceData->description();

diff --git a/doomsday/sdk/libcore/include/de/filesys/node.h b/doomsday/sdk/libcore/include/de/filesys/node.h
@@ -46,6 +46,9 @@ class DENG2_PUBLIC Node : public Lockable, public Deletable
     /// Returns the name of the file.
     String name() const;
 
+    /// Returns the file name extension, including the preceding dot (".zip").
+    String extension() const;
+
     /**
      * Sets the parent node of this file.
      */

diff --git a/doomsday/sdk/libcore/src/data/info.cpp b/doomsday/sdk/libcore/src/data/info.cpp
@@ -374,7 +374,7 @@ DENG2_PIMPL(Info)
         }
 
         // Continue parsing normally from here.
-        int endPos = startPos + lex.pos();
+        int endPos = startPos + int(lex.pos());
         do { nextChar(); } while (cursor < endPos); // fast-forward
 
         // Update the current token.
@@ -391,7 +391,7 @@ DENG2_PIMPL(Info)
         //qDebug() << "now at" << content.substr(endPos - 15, endPos) << "^" << content.substr(endPos);
 
         // Whitespace is removed from beginning and end.
-        return InfoValue(content.substr(startPos, lex.pos() - 1).trimmed(), InfoValue::Script);
+        return InfoValue(content.substr(startPos, int(lex.pos()) - 1).trimmed(), InfoValue::Script);
     }
 
     /**

diff --git a/doomsday/sdk/libcore/src/data/ziparchive.cpp b/doomsday/sdk/libcore/src/data/ziparchive.cpp
@@ -620,7 +620,7 @@ bool ZipArchive::recognize(File const &file)
     if (file.status().type() == File::Status::FILE)
     {
         // For now, just check the name.
-        return recognizeZipExtension(file.name().fileNameExtension().lower());
+        return recognizeZipExtension(file.extension().lower());
     }
     return false;
 }

diff --git a/doomsday/sdk/libcore/src/filesys/node.cpp b/doomsday/sdk/libcore/src/filesys/node.cpp
@@ -43,6 +43,11 @@ String Node::name() const
     return d->name;
 }
 
+String Node::extension() const
+{
+    return d->name.fileNameExtension();
+}
+
 void Node::setParent(Node *parent)
 {
     DENG2_GUARD(this);

diff --git a/doomsday/sdk/libcore/src/filesys/package.cpp b/doomsday/sdk/libcore/src/filesys/package.cpp
@@ -384,7 +384,7 @@ String Package::identifierForFile(File const &file)
     // Form the prefix if there are enclosing packs as parents.
     String prefix;
     Folder const *parent = file.parent();
-    while (parent && parent->name().fileNameExtension() == ".pack")
+    while (parent && parent->extension() == ".pack")
     {
         prefix = extractIdentifier(parent->name()) + "." + prefix;
         parent = parent->parent();
@@ -396,7 +396,7 @@ File const *Package::containerOfFile(File const &file)
 {
     // Find the containing package.
     File const *i = file.parent();
-    while (i && i->name().fileNameExtension() != ".pack")
+    while (i && i->extension() != ".pack")
     {
         i = i->parent();
     }

diff --git a/doomsday/sdk/libgui/src/audio/waveform.cpp b/doomsday/sdk/libgui/src/audio/waveform.cpp
@@ -112,7 +112,7 @@ DENG2_PIMPL(Waveform)
 
     void load(File const &src)
     {
-        if (!src.name().fileNameExtension().compareWithoutCase(".wav"))
+        if (!src.extension().compareWithoutCase(".wav"))
         {
             // We know how to read WAV files.
             loadWAV(Block(src));

diff --git a/doomsday/sdk/libgui/src/graphics/image.cpp b/doomsday/sdk/libgui/src/graphics/image.cpp
@@ -896,7 +896,7 @@ Image Image::fromMaskedIndexedData(Size const &size, IByteArray const &imageAndM
 
 bool Image::recognize(File const &file)
 {
-    String const ext = file.name().fileNameExtension().toLower();
+    String const ext = file.extension().toLower();
     return (ext == ".tga"  || ext == ".pcx" || ext == ".png"  || ext == ".jpg" ||
             ext == ".jpeg" || ext == ".gif" || ext == ".tiff" || ext == ".ico");
 }

diff --git a/doomsday/sdk/libgui/src/graphics/imagefile.cpp b/doomsday/sdk/libgui/src/graphics/imagefile.cpp
@@ -155,7 +155,7 @@ Image ImageFile::image() const
     }
     else
     {
-        return Image::fromData(*source(), name().fileNameExtension());
+        return Image::fromData(*source(), extension());
     }
 }
 

diff --git a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp
@@ -651,7 +651,7 @@ DENG2_PIMPL(ModelDrawable)
          * Autodetect if these exist and make a list of their names.
          */
         String anims;
-        if (file.name().fileNameExtension() == ".md5mesh")
+        if (file.extension() == ".md5mesh")
         {
             String const baseName = file.name().fileNameWithoutExtension() + "_";
             for (auto const i : file.parent()->contents())