Merge branch 'main' of https://github.com/yqzhishen/opensvip

Author: yqzhishen

csharp/Plugins/Gjgj/Plugin.Gjgj.csproj

@@ -38,9 +38,8 @@
     </StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\软件\编曲\合成器\X Studio 2.0.2\XStudioSinger\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -62,6 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Framework\OpenSvip.Framework.csproj">

csharp/Plugins/Gjgj/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+</packages>

csharp/Plugins/Vogen/Plugin.Vogen.csproj

@@ -32,11 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\软件\编曲\合成器\X Studio 2.0.2\XStudioSinger\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -53,6 +52,7 @@
     <Compile Include="VogenDecoder.cs" />
     <Compile Include="VogenEncoder.cs" />
     <Compile Include="VogenModel.cs" />
+    <Compile Include="ZipHelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Framework\OpenSvip.Framework.csproj">

csharp/Plugins/Vogen/Properties.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Plugin>
     <Name>Vogen</Name>
-    <Version>0.1.0</Version>
+    <Version>0.2.0</Version>
     <Author>笛鹿FlutyDeer</Author>
     <HomePage>https://space.bilibili.com/386270936</HomePage>
     <Descriptions>Vogen 工程格式转换插件。</Descriptions>

csharp/Plugins/Vogen/VogenConverter.cs

@@ -1,12 +1,11 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Text;
 using Newtonsoft.Json;
 using OpenSvip.Framework;
 using OpenSvip.Model;
-using System;
 using Plugin.Vogen;
 using Vogen.Model;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace Vogen.Stream
 {
@@ -15,12 +14,15 @@ internal class VogenConverter : IProjectConverter
 
         public Project Load(string path, ConverterOptions options)
         {
-            var stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+            ZipHelper.DecompressFile(path, Path.GetDirectoryName(path));
+            string chartJsonPath = Path.GetDirectoryName(path) + "\\" + "chart.json";
+            var stream = new FileStream(chartJsonPath, FileMode.Open, FileAccess.Read);
             var reader = new StreamReader(stream, Encoding.UTF8);
             var vogenProject = JsonConvert.DeserializeObject<VogenProject>(reader.ReadToEnd());
             stream.Close();
             reader.Close();
             return new VogenDecoder().DecodeProject(vogenProject);
+            //return new Project();
         }
 
         public void Save(string path, Project project, ConverterOptions options)
@@ -40,55 +42,9 @@ public void Save(string path, Project project, ConverterOptions options)
             string chartJsonPath = Path.GetDirectoryName(path) + "\\" + "chart.json";
             FileInfo fi = new FileInfo(path);
             fi.MoveTo(chartJsonPath);
-            ZipFile(chartJsonPath, Path.GetDirectoryName(path) + "\\" +  Path.GetFileNameWithoutExtension(path) + ".vog");
+            ZipHelper.CompressFile(chartJsonPath, Path.GetDirectoryName(path) + "\\" +  Path.GetFileNameWithoutExtension(path) + ".vog");
             File.Delete(chartJsonPath);
         }
-
-        /// <summary>
-        /// 单文件压缩
-        /// </summary>
-        /// <param name="sourceFile">源文件</param>
-        /// <param name="zipedFile">zip压缩文件</param>
-        /// <param name="blockSize">缓冲区大小</param>
-        /// <param name="compressionLevel">压缩级别</param>
-        public static void ZipFile(string sourceFile, string zipedFile, int blockSize = 1024, int compressionLevel = 6)
-        {
-            if (!File.Exists(sourceFile))
-            {
-                throw new System.IO.FileNotFoundException("The specified file " + sourceFile + " could not be found.");
-            }
-            var fileName = System.IO.Path.GetFileName(sourceFile);
-
-            FileStream streamToZip = new FileStream(sourceFile, FileMode.Open, FileAccess.Read);
-            FileStream zipFile = File.Create(zipedFile);
-            ZipOutputStream zipStream = new ZipOutputStream(zipFile);
-
-            ZipEntry zipEntry = new ZipEntry(fileName);
-            zipStream.PutNextEntry(zipEntry);
-
-            //存储、最快、较快、标准、较好、最好  0-9
-            zipStream.SetLevel(compressionLevel);
-
-            byte[] buffer = new byte[blockSize];
-
-            int size = streamToZip.Read(buffer, 0, buffer.Length);
-            zipStream.Write(buffer, 0, size);
-            try
-            {
-                while (size < streamToZip.Length)
-                {
-                    int sizeRead = streamToZip.Read(buffer, 0, buffer.Length);
-                    zipStream.Write(buffer, 0, sizeRead);
-                    size += sizeRead;
-                }
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-            zipStream.Finish();
-            zipStream.Close();
-            streamToZip.Close();
-        }
+        
     }
 }

csharp/Plugins/Vogen/ZipHelper.cs

@@ -0,0 +1,76 @@
+using ICSharpCode.SharpZipLib.Zip;
+using System;
+using System.IO;
+
+namespace Plugin.Vogen
+{
+    public static class ZipHelper
+    {
+        //压缩文件
+        public static void CompressFile(string filePath, string zipPath)
+        {
+            using (ZipOutputStream s = new ZipOutputStream(File.Create(zipPath)))
+            {
+                s.SetLevel(9);
+                byte[] buffer = new byte[4096];
+                ZipEntry entry = new ZipEntry(Path.GetFileName(filePath));
+                entry.DateTime = DateTime.Now;
+                s.PutNextEntry(entry);
+                using (FileStream fs = File.OpenRead(filePath))
+                {
+                    int sourceBytes;
+                    do
+                    {
+                        sourceBytes = fs.Read(buffer, 0, buffer.Length);
+                        s.Write(buffer, 0, sourceBytes);
+                    } while (sourceBytes > 0);
+                }
+                s.Finish();
+                s.Close();
+            }
+        }
+
+        //解压文件
+        public static void DecompressFile(string sourceFile, string targetPath)
+        {
+            if (!File.Exists(sourceFile))
+            {
+                throw new FileNotFoundException(string.Format("未能找到文件 '{0}' ", sourceFile));
+            }
+            if (!Directory.Exists(targetPath))
+            {
+                Directory.CreateDirectory(targetPath);
+            }
+            using (var s = new ZipInputStream(File.OpenRead(sourceFile)))
+            {
+                ZipEntry theEntry;
+                while ((theEntry = s.GetNextEntry()) != null)
+                {
+                    if (theEntry.IsDirectory)
+                    {
+                        continue;
+                    }
+                    string directorName = Path.Combine(targetPath, Path.GetDirectoryName(theEntry.Name));
+                    string fileName = Path.Combine(directorName, Path.GetFileName(theEntry.Name));
+                    if (!Directory.Exists(directorName))
+                    {
+                        Directory.CreateDirectory(directorName);
+                    }
+                    if (!String.IsNullOrEmpty(fileName))
+                    {
+                        using (FileStream streamWriter = File.Create(fileName))
+                        {
+                            int size = 4096;
+                            byte[] data = new byte[size];
+                            while (size > 0)
+                            {
+                                streamWriter.Write(data, 0, size);
+                                size = s.Read(data, 0, data.Length);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

csharp/Plugins/Vogen/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ICSharpCode.SharpZipLib.dll" version="0.85.4.369" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
 </packages>