Installer created for khernet.

lemalcs · Apr 3, 2021 · d9925f7 · d9925f7
1 parent dfd043f
commit d9925f7
Show file tree

Hide file tree

Showing 87 changed files with 2,435 additions and 167 deletions.
diff --git a/Khernet.Core/Engine/Khernet.Core.Common/Khernet.Core.Common.csproj b/Khernet.Core/Engine/Khernet.Core.Common/Khernet.Core.Common.csproj
@@ -75,6 +75,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Khernet.Core/Engine/Khernet.Core.Common/Storage.cs b/Khernet.Core/Engine/Khernet.Core.Common/Storage.cs
@@ -21,6 +21,16 @@ public enum StorageType
 
     public class Storage
     {
+        public const string CONFIGURATION_FILE = "config";
+
+        public const string FIREBIRD_LIBRARY = "fbclient.dll";
+
+        public const string MESSAGE_DB = "msgdb";
+
+        public const string FILE_DB = "stgdb";
+
+        private readonly string dataFolder = "data";
+
         /// <summary>
         /// The path of file system where FIREBIRD engine is located.
         /// </summary>
@@ -29,7 +39,7 @@ public string EngineAddress
             get
             {
                 var assembly = System.Reflection.Assembly.GetEntryAssembly();
-                return Path.Combine(Path.GetDirectoryName(assembly.Location), "dbin\\fbclient.dll");
+                return Path.Combine(Path.GetDirectoryName(assembly.Location), "firebird", "fbclient.dll");
             }
         }
 
@@ -57,7 +67,7 @@ public string RepoAddress
             get
             {
                 var assembly = System.Reflection.Assembly.GetEntryAssembly();
-                return Path.Combine(Path.GetDirectoryName(assembly.Location), "kdata\\E7FE8601FEAE.KND");
+                return Path.Combine(Path.GetDirectoryName(assembly.Location), this.dataFolder, MESSAGE_DB);
             }
         }
 
@@ -69,7 +79,7 @@ public string FileRepoAddress
             get
             {
                 var assembly = System.Reflection.Assembly.GetEntryAssembly();
-                return Path.Combine(Path.GetDirectoryName(assembly.Location), "kdata\\KL732418.KND");
+                return Path.Combine(Path.GetDirectoryName(assembly.Location), this.dataFolder, FILE_DB);
             }
         }
 
@@ -85,30 +95,6 @@ public string CacheAddress
             }
         }
 
-        /// <summary>
-        /// The path of file system where FFMPEG library is located.
-        /// </summary>
-        public string MediaToolsAddress
-        {
-            get
-            {
-                var assembly = System.Reflection.Assembly.GetEntryAssembly();
-                return Path.Combine(Path.GetDirectoryName(assembly.Location), "tls");
-            }
-        }
-
-        /// <summary>
-        /// The path of file system where VLC library is located.
-        /// </summary>
-        public string VLCLibX86Address
-        {
-            get
-            {
-                var assembly = System.Reflection.Assembly.GetEntryAssembly();
-                return Path.Combine(Path.GetDirectoryName(assembly.Location), "libvlc", "win-x86");
-            }
-        }
-
         /// <summary>
         /// Gets a connection string to a specific database based on <see cref="StorageType"/> enumeration.
         /// </summary>

diff --git a/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj b/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj
@@ -69,11 +69,17 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Khernet.App.Container.1.0.11\build\Khernet.App.Container.targets" Condition="Exists('..\..\packages\Khernet.App.Container.1.0.11\build\Khernet.App.Container.targets')" />
+  <Import Project="..\..\packages\Khernet.App.Container.1.1.0\build\Khernet.App.Container.targets" Condition="Exists('..\..\packages\Khernet.App.Container.1.1.0\build\Khernet.App.Container.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Khernet.App.Container.1.0.11\build\Khernet.App.Container.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Khernet.App.Container.1.0.11\build\Khernet.App.Container.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Khernet.App.Container.1.1.0\build\Khernet.App.Container.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Khernet.App.Container.1.1.0\build\Khernet.App.Container.targets'))" />
   </Target>
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/Khernet.Core/Engine/Khernet.Core.Container/ResourceContainer.cs b/Khernet.Core/Engine/Khernet.Core.Container/ResourceContainer.cs
@@ -5,57 +5,12 @@ namespace Khernet.Core.Resources
 {
     public class ResourceContainer
     {
-        /// <summary>
-        /// Get the configuration file (FIREBIRD database) for application.
-        /// </summary>
-        /// <returns>An array of bytes containing FIREBIRD database.</returns>
-        public byte[] GetConfigurationFile()
-        {
-            return GetResource("CONFIG_zip");
-        }
-
-        /// <summary>
-        /// Get the FIREBIRD database libraries.
-        /// </summary>
-        /// <returns>A <see cref="byte"/> array of zip file containing FIREBIRD libraries.</returns>
-        public byte[] GetDataBaseEngine()
-        {
-            return GetResource("FIREBIRD");
-        }
-
-        /// <summary>
-        /// Get the database to store data used by application for example: chat messages, contact list.
-        /// </summary>
-        /// <returns>A <see cref="byte"/> array of zip file containing database.</returns>
-        public byte[] GetApplicationDataBase()
-        {
-            return GetResource("KH_zip");
-        }
-
-        /// <summary>
-        /// Get FFMPEG libraries to read and write media files
-        /// </summary>
-        /// <returns>A <see cref="byte"/> array of zip file containing FFMPEG libraries</returns>
-        public byte[] GetMediaTools()
-        {
-            return GetResource("tls_zip");
-        }
-
-        /// <summary>
-        /// Get VLC libraries to play audio and video files.
-        /// </summary>
-        /// <returns>A <see cref="byte"/> array of zip file containing VLC libraries.</returns>
-        public byte[] GetVLCLibrary()
-        {
-            return GetResource("vlc_x86_zip");
-        }
-
         /// <summary>
         /// Gets a resource that is embedded into assembly.
         /// </summary>
         /// <param name="assetName">The name of resource to get.</param>
         /// <returns>A <see cref="byte"/> array containing the resource.</returns>
-        private byte[] GetResource(string assetName)
+        public byte[] GetResource(string assetName)
         {
             Assembly executingAssembly = Assembly.GetExecutingAssembly();
 

diff --git a/Khernet.Core/Engine/Khernet.Core.Container/packages.config b/Khernet.Core/Engine/Khernet.Core.Container/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Khernet.App.Container" version="1.0.11" targetFramework="net40" />
+  <package id="Khernet.App.Container" version="1.1.0" targetFramework="net40" />
 </packages>
diff --git a/Khernet.Core/Engine/Khernet.Core.Data/Khernet.Core.Data.csproj b/Khernet.Core/Engine/Khernet.Core.Data/Khernet.Core.Data.csproj
@@ -89,6 +89,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Khernet.Core/Engine/Khernet.Core.Entity/Khernet.Core.Entity.csproj b/Khernet.Core/Engine/Khernet.Core.Entity/Khernet.Core.Entity.csproj
@@ -71,6 +71,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Khernet.Core/Engine/Khernet.Core.Host/RegionFactory.cs b/Khernet.Core/Engine/Khernet.Core.Host/RegionFactory.cs
@@ -36,29 +36,13 @@ private bool ValidateDatabase()
 
         public void Build()
         {
-            if (!ValidateDatabase())
-            {
-                InstallDatabaseEngine();
-            }
             if (!ValidateDatabase())
             {
                 CreateDatabases();
             }
             Storage storage = new Storage();
             if (!Directory.Exists(storage.CacheAddress))
                 Directory.CreateDirectory(storage.CacheAddress);
-
-            if (!Directory.Exists(storage.MediaToolsAddress))
-            {
-                Directory.CreateDirectory(storage.MediaToolsAddress);
-                UnPackMediaTools();
-            }
-
-            if (!Directory.Exists(storage.VLCLibX86Address))
-            {
-                Directory.CreateDirectory(storage.VLCLibX86Address);
-                UnPackVLCLib();
-            }
         }
 
         public bool IsInitialized()
@@ -68,71 +52,41 @@ public bool IsInitialized()
             return storage.VerifyInitialization();
         }
 
-        private void InstallDatabaseEngine()
-        {
-            try
-            {
-                //Create folder to store FIREBIRD database engine files
-                Storage storage = new Storage();
-                string firebirdEnginePath = Path.GetDirectoryName(storage.EngineAddress);
-
-                if (!Directory.Exists(firebirdEnginePath))
-                {
-                    Directory.CreateDirectory(firebirdEnginePath);
-                }
-
-                ResourceContainer rc = new ResourceContainer();
-
-                using (MemoryStream memStream = new MemoryStream(rc.GetDataBaseEngine()))
-                {
-                    Compressor compressor = new Compressor();
-                    compressor.UnZipFile(memStream, firebirdEnginePath);
-                }
-            }
-            catch (Exception exception)
-            {
-                LogDumper.WriteLog(exception);
-                throw;
-            }
-        }
-
         private void CreateDatabases()
         {
             try
             {
                 //Create database for configurations and a database to store data of application
                 Storage storage = new Storage();
                 string repositoryPath = Path.GetDirectoryName(storage.RepoAddress);
-
+                
                 if (!Directory.Exists(repositoryPath))
                 {
                     Directory.CreateDirectory(repositoryPath);
                 }
-
+                
                 //Rename the existing file if someone is found
                 RenameExistingFile(storage.ConfigAddress);
 
                 ResourceContainer rc = new ResourceContainer();
 
                 //Decompress ZIP file with configuration database
-                using (MemoryStream memStream = new MemoryStream(rc.GetConfigurationFile()))
+                using (MemoryStream memStream = new MemoryStream(rc.GetResource(Storage.CONFIGURATION_FILE)))
                 {
                     Compressor compressor = new Compressor();
                     compressor.UnZipFile(memStream, Path.GetDirectoryName(storage.ConfigAddress));
-
-                    File.Move(Path.Combine(Path.GetDirectoryName(storage.ConfigAddress), "CONFIG"), storage.ConfigAddress);
+                    File.Move(Path.Combine(Path.GetDirectoryName(storage.ConfigAddress), Storage.CONFIGURATION_FILE), storage.ConfigAddress);
                 }
 
                 //Rename the existing file if someone is found
                 RenameExistingFile(storage.RepoAddress);
 
                 //Decompress ZIP file with application database
-                using (MemoryStream memStream = new MemoryStream(rc.GetApplicationDataBase()))
+                using (MemoryStream memStream2 = new MemoryStream(rc.GetResource(Storage.MESSAGE_DB)))
                 {
-                    Compressor compressor = new Compressor();
-                    compressor.UnZipFile(memStream, Path.GetDirectoryName(storage.RepoAddress));
-
-                    File.Move(Path.Combine(Path.GetDirectoryName(storage.RepoAddress), "KH"), storage.RepoAddress);
+                    Compressor compressor2 = new Compressor();
+                    compressor2.UnZipFile(memStream2, Path.GetDirectoryName(storage.RepoAddress));
+                    File.Move(Path.Combine(Path.GetDirectoryName(storage.RepoAddress), Storage.MESSAGE_DB), storage.RepoAddress);
                 }
             }
             catch (Exception exception)
@@ -142,30 +96,6 @@ private void CreateDatabases()
             }
         }
 
-        private void UnPackMediaTools()
-        {
-            ResourceContainer rc = new ResourceContainer();
-            using (MemoryStream memStream = new MemoryStream(rc.GetMediaTools()))
-            {
-                Compressor compressor = new Compressor();
-                Storage storage = new Storage();
-
-                compressor.UnZipFile(memStream, storage.MediaToolsAddress);
-            }
-        }
-
-        private void UnPackVLCLib()
-        {
-            ResourceContainer rc = new ResourceContainer();
-            using (MemoryStream memStream = new MemoryStream(rc.GetVLCLibrary()))
-            {
-                Compressor compressor = new Compressor();
-                Storage storage = new Storage();
-
-                compressor.UnZipFile(memStream, storage.VLCLibX86Address);
-            }
-        }
-
         private string RenameExistingFile(string fileName)
         {
             try

diff --git a/Khernet.Core/Engine/Khernet.Core.Processor/Khernet.Core.Processor.csproj b/Khernet.Core/Engine/Khernet.Core.Processor/Khernet.Core.Processor.csproj
@@ -111,6 +111,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Khernet.Core/Engine/Khernet.Core.Utility/Khernet.Core.Utility.csproj b/Khernet.Core/Engine/Khernet.Core.Utility/Khernet.Core.Utility.csproj
@@ -105,6 +105,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Khernet.Core/Services/Khernet.Services.Client/Khernet.Services.Client.csproj b/Khernet.Core/Services/Khernet.Services.Client/Khernet.Services.Client.csproj
@@ -87,6 +87,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Khernet.Core/Services/Khernet.Services.Common/Khernet.Services.Common.csproj b/Khernet.Core/Services/Khernet.Services.Common/Khernet.Services.Common.csproj
@@ -74,6 +74,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>set bin_directory=..\..\..\..\..\..\bin\Khernet.Core
+IF not exist %25lib_directory%25 mkdir %25bin_directory%25
+
+copy /Y $(TargetDir) %25bin_directory%25</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">