Refactored some code for later use

AnTasMes · Aug 10, 2024 · 0cdd05a · 0cdd05a
1 parent 893758e
commit 0cdd05a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -396,3 +396,5 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+/File.Validator/File.Validator.MVC.Test
+/File.Validator/File.Validator.Test
diff --git a/File.Validator/File.Validator.Web/File.Validator.Web.csproj b/File.Validator/File.Validator.Web/File.Validator.Web.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/File.Validator/File.Validator/File.Validator.csproj b/File.Validator/File.Validator/File.Validator.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
 </Project>
diff --git a/File.Validator/File.Validator/FileExtensions/FileExtension.cs b/File.Validator/File.Validator/FileExtensions/FileExtension.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace File.Validator.FileExtensions
 {
@@ -9,5 +10,23 @@ public abstract class FileExtensionInfo
         public abstract string Name { get; }
         public abstract int Offset { get; }
         public abstract string[] Hex { get; }
+
+        public virtual bool IsValid (BinaryReader reader)
+        {
+            // Postavi offset
+            reader.BaseStream.Seek(this.Offset, SeekOrigin.Begin);
+
+            // Izvlaci broj bajtova u najduzem hex potpisu
+            string longestSignature = this.Hex.OrderByDescending(h => h.Length).First();
+            int longestSignatureLen = Regex.Matches(longestSignature, "[a-zA-Z0-9][a-zA-Z0-9]").Count;
+
+            // Procitaj N bajtova iz niza
+            byte[] data = reader.ReadBytes(longestSignatureLen);
+            string data_as_hex = BitConverter.ToString(data);
+            reader.Close();
+
+            // Proveriti da li data_as_hex poseduje neki do potpisa u nizu
+            return this.Hex.Any(h => data_as_hex.Contains(h));
+        }
     }
 }
diff --git a/File.Validator/File.Validator/FileValidator.cs b/File.Validator/File.Validator/FileValidator.cs
@@ -1,11 +1,5 @@
-using File.Validator;
-using File.Validator.FileExtensions;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using File.Validator.FileExtensions;
 using System.Reflection;
-using System.Text.RegularExpressions;
 
 namespace File.Validator
 {
@@ -43,20 +37,7 @@ public static bool isValidExtension(Stream stream, string expectedExtension)
             if (fileExtensionInfo == null)
                 return false;
 
-            // Postavi offset
-            reader.BaseStream.Seek(fileExtensionInfo.Offset, SeekOrigin.Begin);
-
-            // Izvlaci broj bajtova u najduzem hex potpisu
-            string longestSignature = fileExtensionInfo.Hex.OrderByDescending(h => h.Length).First();
-            int longestSignatureLen = Regex.Matches(longestSignature, "[a-zA-Z0-9][a-zA-Z0-9]").Count;
-
-            // Procitaj N bajtova iz niza
-            byte[] data = reader.ReadBytes(longestSignatureLen);   
-            string data_as_hex = BitConverter.ToString(data);
-            reader.Close();
-
-            // Proveriti da li data_as_hex poseduje neki do potpisa u nizu
-            return fileExtensionInfo.Hex.Any(h => data_as_hex.Contains(h));
+            return fileExtensionInfo.IsValid(reader);
         }
 
         /// <summary>