[rfile] Throw exception for .zip files

Author: silverweed

io/io/src/RFile.cxx

@@ -28,17 +28,6 @@ ROOT::RLogChannel &ROOT::Experimental::Internal::RFileLog()
 using ROOT::Experimental::RFile;
 using ROOT::Experimental::Internal::RFileLog;
 
-static void CheckExtension(std::string_view path)
-{
-   if (ROOT::EndsWith(path, ".xml")) {
-      throw ROOT::RException(R__FAIL("ROOT::RFile doesn't support XML files."));
-   }
-
-   if (!ROOT::EndsWith(path, ".root")) {
-      R__LOG_INFO(RFileLog()) << "ROOT::RFile only supports ROOT files. The preferred file extension is \".root\"";
-   }
-}
-
 namespace {
 enum class ENameCycleError {
    kNoError,
@@ -186,39 +175,42 @@ RFile::~RFile() = default;
 
 std::unique_ptr<RFile> RFile::Open(std::string_view path)
 {
-   CheckExtension(path);
-
    TDirectory::TContext ctx(nullptr); // XXX: probably not thread safe?
    auto tfile = std::unique_ptr<TFile>(TFile::Open(std::string(path).c_str(), "READ_WITHOUT_GLOBALREGISTRATION"));
    if (!tfile || tfile->IsZombie())
       throw ROOT::RException(R__FAIL("failed to open file " + std::string(path) + " for reading"));
 
+   if (tfile->IsRaw())
+      throw ROOT::RException(R__FAIL("Opened file " + std::string(path) + " is not a ROOT file"));
+
    auto rfile = std::unique_ptr<RFile>(new RFile(std::move(tfile)));
    return rfile;
 }
 
 std::unique_ptr<RFile> RFile::Update(std::string_view path)
 {
-   CheckExtension(path);
-
    TDirectory::TContext ctx(nullptr); // XXX: probably not thread safe?
    auto tfile = std::unique_ptr<TFile>(TFile::Open(std::string(path).c_str(), "UPDATE_WITHOUT_GLOBALREGISTRATION"));
    if (!tfile || tfile->IsZombie())
       throw ROOT::RException(R__FAIL("failed to open file " + std::string(path) + " for updating"));
 
+   if (tfile->IsRaw())
+      throw ROOT::RException(R__FAIL("Opened file " + std::string(path) + " is not a ROOT file"));
+
    auto rfile = std::unique_ptr<RFile>(new RFile(std::move(tfile)));
    return rfile;
 }
 
 std::unique_ptr<RFile> RFile::Recreate(std::string_view path)
 {
-   CheckExtension(path);
-
    TDirectory::TContext ctx(nullptr); // XXX: probably not thread safe?
    auto tfile = std::unique_ptr<TFile>(TFile::Open(std::string(path).c_str(), "RECREATE_WITHOUT_GLOBALREGISTRATION"));
    if (!tfile || tfile->IsZombie())
       throw ROOT::RException(R__FAIL("failed to open file " + std::string(path) + " for writing"));
 
+   if (tfile->IsRaw())
+      throw ROOT::RException(R__FAIL("Opened file " + std::string(path) + " is not a ROOT file"));
+
    auto rfile = std::unique_ptr<RFile>(new RFile(std::move(tfile)));
    return rfile;
 }

io/io/test/rfile.cxx

@@ -266,16 +266,23 @@ TEST(RFile, PutOverwrite)
 TEST(RFile, WrongExtension)
 {
    ROOT::RLogScopedVerbosity logVerb(ROOT::ELogLevel::kInfo);
+   // Root files with unconventional extensions are supported.
    {
       FileRaii fileGuard("test_rfile_wrong.root.1");
-      ROOT::TestSupport::CheckDiagsRAII diagsRaii;
-      diagsRaii.requiredDiag(kInfo, "ROOT.File", "preferred file extension is \".root\"", false);
       RFile::Recreate(fileGuard.GetPath());
    }
+
+   // XML files are not supported.
+   FileRaii fileGuardXml("test_rfile_wrong.xml");
+   {
+      auto file = std::unique_ptr<TFile>(TFile::Open(fileGuardXml.GetPath().c_str(), "RECREATE"));
+      TH1D h("h", "h", 10, 0, 1);
+      file->WriteObject(&h, "h");
+   }
    {
-      FileRaii fileGuard("test_rfile_wrong.xml");
-      ROOT::TestSupport::CheckDiagsRAII diagsRaii;
-      EXPECT_THROW(RFile::Recreate(fileGuard.GetPath()), ROOT::RException);
+      EXPECT_THROW(RFile::Open(fileGuardXml.GetPath()), ROOT::RException);
+      EXPECT_THROW(RFile::Update(fileGuardXml.GetPath()), ROOT::RException);
+      EXPECT_THROW(RFile::Recreate(fileGuardXml.GetPath()), ROOT::RException);
    }
 }