diff --git a/ContentDetectorLibrary/AlphaFS.dll b/ContentDetectorLibrary/AlphaFS.dll new file mode 100644 index 0000000..1b7c172 Binary files /dev/null and b/ContentDetectorLibrary/AlphaFS.dll differ diff --git a/ContentDetectorLibrary/Common.cs b/ContentDetectorLibrary/Common.cs index 408e43f..32d48e9 100644 --- a/ContentDetectorLibrary/Common.cs +++ b/ContentDetectorLibrary/Common.cs @@ -56,17 +56,17 @@ public FileResult() Deleted = false; } - public FileResult(Delimon.Win32.IO.DirectoryInfo ddir) + public FileResult(Alphaleonis.Win32.Filesystem.DirectoryInfo ddir) { FileResultContructor(ddir, "", ""); } - public FileResult(Delimon.Win32.IO.DirectoryInfo ddir, string strComment) + public FileResult(Alphaleonis.Win32.Filesystem.DirectoryInfo ddir, string strComment) { FileResultContructor(ddir, strComment, ""); } - private void FileResultContructor(Delimon.Win32.IO.DirectoryInfo ddir, string strComment, string strFileFilterSearched) + private void FileResultContructor(Alphaleonis.Win32.Filesystem.DirectoryInfo ddir, string strComment, string strFileFilterSearched) { Name = ddir.Name; FullPath = ddir.FullName; @@ -82,22 +82,22 @@ private void FileResultContructor(Delimon.Win32.IO.DirectoryInfo ddir, string st Deleted = false; } - public FileResult(Delimon.Win32.IO.DirectoryInfo ddir, string strComment, string strFileFilterSearched) + public FileResult(Alphaleonis.Win32.Filesystem.DirectoryInfo ddir, string strComment, string strFileFilterSearched) { FileResultContructor(ddir, strComment, strFileFilterSearched); } - public FileResult(Delimon.Win32.IO.FileInfo dfile) + public FileResult(Alphaleonis.Win32.Filesystem.FileInfo dfile) { FileResultContructor(dfile, "", ""); } - public FileResult(Delimon.Win32.IO.FileInfo dfile, string strComment) + public FileResult(Alphaleonis.Win32.Filesystem.FileInfo dfile, string strComment) { FileResultContructor(dfile, strComment, ""); } - private void FileResultContructor(Delimon.Win32.IO.FileInfo dfile, string strComment, string strFileFilterSearched) + private void FileResultContructor(Alphaleonis.Win32.Filesystem.FileInfo dfile, string strComment, string strFileFilterSearched) { Name = dfile.Name; FullPath = dfile.FullName; @@ -113,7 +113,7 @@ private void FileResultContructor(Delimon.Win32.IO.FileInfo dfile, string strCom Deleted = false; } - public FileResult(Delimon.Win32.IO.FileInfo dfile, string strComment, string strFileFilterSearched) + public FileResult(Alphaleonis.Win32.Filesystem.FileInfo dfile, string strComment, string strFileFilterSearched) { FileResultContructor(dfile, strComment, strFileFilterSearched); @@ -339,7 +339,7 @@ public static string GetPathToHTMLAnchor(string strpath) /// /// /// - public static bool IsFileLocked(Delimon.Win32.IO.FileInfo file) + public static bool IsFileLocked(Alphaleonis.Win32.Filesystem.FileInfo file) { FileStream stream = null; try @@ -383,7 +383,7 @@ public static bool IsFileLocked(Delimon.Win32.IO.FileInfo file) /// /// /// - public static Delimon.Win32.IO.FileInfo RefreshFileInfo(Delimon.Win32.IO.FileInfo file) + public static Alphaleonis.Win32.Filesystem.FileInfo RefreshFileInfo(Alphaleonis.Win32.Filesystem.FileInfo file) { FileStream fs = null; try @@ -435,7 +435,7 @@ public static bool DirectoryExists(string strPath) try { strPath = WindowsPathClean(strPath); - blSuccess = Delimon.Win32.IO.Directory.Exists(strPath); + blSuccess = Alphaleonis.Win32.Filesystem.Directory.Exists(strPath); } catch (Exception) { @@ -450,7 +450,7 @@ public static bool FileExists(string strPath) try { strPath = WindowsPathClean(strPath); - blSuccess = Delimon.Win32.IO.File.Exists(strPath); + blSuccess = Alphaleonis.Win32.Filesystem.File.Exists(strPath); } catch (Exception) { diff --git a/ContentDetectorLibrary/ContentDetectorEngine.cs b/ContentDetectorLibrary/ContentDetectorEngine.cs index 3b2af83..f3ec3dd 100644 --- a/ContentDetectorLibrary/ContentDetectorEngine.cs +++ b/ContentDetectorLibrary/ContentDetectorEngine.cs @@ -322,7 +322,7 @@ public static DataTable init_dtSignature() /// The file path. /// private bool ContainsProhibitedFileContent( - Delimon.Win32.IO.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) + Alphaleonis.Win32.Filesystem.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) { WriteError(string.Format( @"Audit Folder ContentDetectorEngine: Processing content of file '{0}' ({1:0,0} bytes).", @@ -355,7 +355,7 @@ private bool ContainsProhibitedFileContent( } public void ContainsFolderVerifyContent( - Delimon.Win32.IO.DirectoryInfo folderPath, + Alphaleonis.Win32.Filesystem.DirectoryInfo folderPath, bool recursive, ref List verifiedFiles, ref List unVerifiedFiles, @@ -383,7 +383,7 @@ bool blProhibitedFilesIgnoreFileExtensions /// [the specified folder path]; otherwise, false. /// public void ContainsFolderVerifyContent( - Delimon.Win32.IO.DirectoryInfo folderPath, + Alphaleonis.Win32.Filesystem.DirectoryInfo folderPath, bool recursive, ref List verifiedFiles, ref List unVerifiedFiles, @@ -450,7 +450,7 @@ bool blProhibitedFilesIgnoreFileExtensions /// [the specified folder path]; otherwise, false. /// private void containsFolderVerifyContent( - Delimon.Win32.IO.DirectoryInfo folderPath, + Alphaleonis.Win32.Filesystem.DirectoryInfo folderPath, bool recursive, ref List verifiedFiles, ref List unVerifiedFiles, @@ -475,17 +475,17 @@ bool blProhibitedFilesIgnoreFileExtensions { sigs = HeaderSignature.StockSignatures; } - - - Delimon.Win32.IO.FileInfo[] filePaths = folderPath.GetFiles(); + + + Alphaleonis.Win32.Filesystem.FileInfo[] filePaths = folderPath.GetFiles(); int index = 0; //Load either default signatures or custom for determining ExtensionSupported? - foreach (Delimon.Win32.IO.FileInfo filePath in filePaths) + foreach (Alphaleonis.Win32.Filesystem.FileInfo filePath in filePaths) { if (blShuttingDown) { @@ -517,7 +517,7 @@ bool blProhibitedFilesIgnoreFileExtensions { if (blValidateZipFiles && HeaderSignature.ZipRelatedExtension(filePath.Extension)) { - using (Stream filestream1 = filePath.Open(Delimon.Win32.IO.FileMode.Open, Delimon.Win32.IO.FileAccess.Read, Delimon.Win32.IO.FileShare.ReadWrite)) + using (Stream filestream1 = filePath.Open(System.IO.FileMode.Open, System.IO.FileAccess.Read, System.IO.FileShare.ReadWrite)) { try @@ -605,9 +605,9 @@ bool blProhibitedFilesIgnoreFileExtensions if (recursive) { - Delimon.Win32.IO.DirectoryInfo[] folderPaths = folderPath.GetDirectories(); + Alphaleonis.Win32.Filesystem.DirectoryInfo[] folderPaths = folderPath.GetDirectories(); - foreach (Delimon.Win32.IO.DirectoryInfo childFolderPath in folderPaths) + foreach (Alphaleonis.Win32.Filesystem.DirectoryInfo childFolderPath in folderPaths) { bool blIgnoreDirectory = false; if (blShuttingDown) @@ -668,7 +668,7 @@ bool blProhibitedFilesIgnoreFileExtensions /// The nesting depth. /// private bool DoVerifyFileHeader( - Delimon.Win32.IO.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) + Alphaleonis.Win32.Filesystem.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) { if (filePath == null || !filePath.Exists || filePath.Length <= 0) { @@ -697,7 +697,7 @@ private bool DoVerifyFileHeader( /// /// true if [is prohibited content] [the specified file path]; otherwise, false. /// - private bool IsVerifiedContent(Delimon.Win32.IO.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) + private bool IsVerifiedContent(Alphaleonis.Win32.Filesystem.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) { return CoreVerifyFileContent(filePath, sigs,ignoreExtension); @@ -713,7 +713,7 @@ private bool IsVerifiedContent(Delimon.Win32.IO.FileInfo filePath, HeaderSignatu /// The file path. /// private bool CoreVerifyFileContent( - Delimon.Win32.IO.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) + Alphaleonis.Win32.Filesystem.FileInfo filePath, HeaderSignature[] sigs, bool ignoreExtension) { WriteError( string.Format( diff --git a/ContentDetectorLibrary/ContentDetectorLib.csproj b/ContentDetectorLibrary/ContentDetectorLib.csproj index 693b49a..45d80dd 100644 --- a/ContentDetectorLibrary/ContentDetectorLib.csproj +++ b/ContentDetectorLibrary/ContentDetectorLib.csproj @@ -36,10 +36,9 @@ 4 - + False - .\Delimon.Win32.IO.dll - False + .\AlphaFS.dll False @@ -71,7 +70,7 @@ - +