From b946f11e048eff810f5d05d6f2a2388157093342 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 7 Feb 2022 14:09:35 +0100 Subject: [PATCH] Filesystem: Add date parameter for GetDateString and GetDateTimeString and CreateDateDirectory --- Modules.Filesystem/File.vb | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Modules.Filesystem/File.vb b/Modules.Filesystem/File.vb index 9a1eb6b9..25b13f23 100644 --- a/Modules.Filesystem/File.vb +++ b/Modules.Filesystem/File.vb @@ -373,14 +373,18 @@ Public Class File Return oIsDirectory End Function - Public Function GetDateDirectory(pBaseDirectory As String) As String - Dim oDateDirectory = GetDateString() + Public Function GetDateDirectory(pBaseDirectory As String, pDate As Date) As String + Dim oDateDirectory = GetDateString(pDate) Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory) Return oFinalDirectory End Function - Public Function CreateDateDirectory(pBaseDirectory As String) As String - Dim oDateDirectory = GetDateString() + Public Function GetDateDirectory(pBaseDirectory As String) As String + Return GetDateDirectory(pBaseDirectory, Now) + End Function + + Public Function CreateDateDirectory(pBaseDirectory As String, pDate As Date) As String + Dim oDateDirectory = GetDateString(pDate) Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory) If IO.Directory.Exists(oFinalDirectory) = False Then @@ -394,14 +398,26 @@ Public Class File Return oFinalDirectory End Function + Public Function CreateDateDirectory(pBaseDirectory As String) As String + Return CreateDateDirectory(pBaseDirectory, Now) + End Function + Public Function GetDateString() As String Return $"{Now:yyyy\\MM\\dd}" End Function + Public Function GetDateString(pDate As Date) As String + Return $"{pDate:yyyy\\MM\\dd}" + End Function + Public Function GetDateTimeString() As String Return $"{Now:yyyy-MM-dd_hh-mm-ffff}" End Function + Public Function GetDateTimeString(pDate As Date) As String + Return $"{pDate:yyyy-MM-dd_hh-mm-ffff}" + End Function + Public Function GetFilenameWithSuffix(pFilePath As String, pSuffix As String) Dim oFileInfo = New IO.FileInfo(pFilePath) Return GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pFilePath), pSuffix, oFileInfo.Extension.Substring(1))