From 44360af3e8fc801d2a75bf19868ee760b8c62d56 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 28 Nov 2017 02:20:56 +0000 Subject: [PATCH] Corrected sidecar filename creation when path is absolute. --- DiscImageChef/ChangeLog | 3 +++ DiscImageChef/Commands/CreateSidecar.cs | 14 ++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 50201b11..c3eb6602 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,6 @@ +* Commands/CreateSidecar.cs: + Corrected sidecar filename creation when path is absolute. + * Options.cs: * Commands/CreateSidecar.cs: Added support for creating a sidecar from a folder containing the diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs index 72a9d03b..a2b59d67 100644 --- a/DiscImageChef/Commands/CreateSidecar.cs +++ b/DiscImageChef/Commands/CreateSidecar.cs @@ -134,10 +134,9 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Writing metadata sidecar"); - FileStream xmlFs = new FileStream(Path.GetDirectoryName(options.InputFile) + - //Path.PathSeparator + - Path.GetFileNameWithoutExtension(options.InputFile) + ".cicm.xml", - FileMode.CreateNew); + FileStream xmlFs = new FileStream(Path.Combine(Path.GetDirectoryName(options.InputFile), + Path.GetFileNameWithoutExtension(options.InputFile) + ".cicm.xml"), + FileMode.CreateNew); System.Xml.Serialization.XmlSerializer xmlSer = new System.Xml.Serialization.XmlSerializer(typeof(CICMMetadataType)); xmlSer.Serialize(xmlFs, sidecar); @@ -174,10 +173,9 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Writing metadata sidecar"); - FileStream xmlFs = new FileStream(Path.GetDirectoryName(options.InputFile) + - //Path.PathSeparator + - Path.GetFileName(options.InputFile) + ".cicm.xml", - FileMode.CreateNew); + FileStream xmlFs = new FileStream(Path.Combine(Path.GetDirectoryName(options.InputFile), + Path.GetFileNameWithoutExtension(options.InputFile) + ".cicm.xml"), + FileMode.CreateNew); System.Xml.Serialization.XmlSerializer xmlSer = new System.Xml.Serialization.XmlSerializer(typeof(CICMMetadataType)); xmlSer.Serialize(xmlFs, sidecar);