Merge branch 'pack1'

Author: genail

Assets/Editor/Tests/Pack1UnarchiverTest.cs

@@ -0,0 +1,64 @@
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+using NUnit.Framework;
+using PatchKit.Unity.Patcher.AppData.Local;
+using PatchKit.Unity.Patcher.Cancellation;
+
+public class Pack1UnarchiverTest
+{
+    private const string Key = "test123";
+    private string _tempDir;
+
+    [SetUp]
+    public void SetUp()
+    {
+        _tempDir = TestHelpers.CreateTemporaryDirectory();
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        TestHelpers.DeleteTemporaryDirectory(_tempDir);
+    }
+
+    [Test]
+    public void Unpack()
+    {
+        string archivePath = TestFixtures.GetFilePath("pack1/test.pack1");
+        string metaPath = TestFixtures.GetFilePath("pack1/test.pack1.meta");
+        string metaString = File.ReadAllText(metaPath);
+        Pack1Meta meta = Pack1Meta.Parse(metaString);
+
+        var pack1Unarchiver = new Pack1Unarchiver(archivePath, meta, _tempDir, Key);
+        pack1Unarchiver.Unarchive(new CancellationToken());
+
+        Assert.True(Directory.Exists(Path.Combine(_tempDir, "dir")));
+
+        var rakefile = Path.Combine(_tempDir, "dir/Rakefile");
+        Assert.True(File.Exists(rakefile));
+        Assert.AreEqual("d2974b45f816b3ddaca7a984a9101707", Md5File(rakefile));
+
+        var rubocopFile = Path.Combine(_tempDir, ".rubocop.yml");
+        Assert.True(File.Exists(rubocopFile));
+        Assert.AreEqual("379cc2261c048e4763969cca74974237", Md5File(rubocopFile));
+    }
+
+    private string Md5File(string path)
+    {
+        using (MD5 md5 = MD5.Create())
+        {
+            using (var stream = File.OpenRead(path))
+            {
+                byte[] bytes = md5.ComputeHash(stream);
+                var sb = new StringBuilder();
+                foreach (byte b in bytes)
+                {
+                    sb.Append(b.ToString("x2"));
+                }
+
+                return sb.ToString();
+            }
+        }
+    }
+}

Assets/Editor/Tests/Pack1UnarchiverTest.cs.meta

@@ -10,6 +10,7 @@ public class RemoteResourceDownloaderTest
 {
     private string _dirPath;
     private string _filePath;
+    private string _metaFilePath;
     private byte[] _fileData;
 
     private ChunksData CreateTestChunksData()
@@ -44,6 +45,7 @@ public void Setup()
     {
         _dirPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
         _filePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        _metaFilePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
         _fileData = new byte[1024];
 
         new Random().NextBytes(_fileData);
@@ -58,6 +60,10 @@ public void TearDown()
         {
             File.Delete(_filePath);
         }
+        if (File.Exists(_metaFilePath))
+        {
+            File.Delete(_metaFilePath);
+        }
         if (Directory.Exists(_dirPath))
         {
             Directory.Delete(_dirPath, true);
@@ -73,7 +79,7 @@ public void UseTorrentDownloaderFirst()
         var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
         var torrentDownloader = Substitute.For<ITorrentDownloader>();
 
-        var downloader = new RemoteResourceDownloader(_filePath, resource, true,
+        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, true,
             (path, remoteResource, timeout) => httpDownloader,
             (path, remoteResource, timeout) => chunkedHttpDownloader,
             (path, remoteResource, timeout) => torrentDownloader);
@@ -96,7 +102,7 @@ public void UseChunkedHttpDownloaderIfTorrentFails()
         torrentDownloader.When(t => t.Download(CancellationToken.Empty)).Do(
             info => { throw new DownloaderException("Test.", DownloaderExceptionStatus.Other); });
 
-        var downloader = new RemoteResourceDownloader(_filePath, resource, true,
+        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, true,
             (path, remoteResource, timeout) => httpDownloader,
             (path, remoteResource, timeout) => chunkedHttpDownloader,
             (path, remoteResource, timeout) => torrentDownloader);
@@ -117,7 +123,7 @@ public void UseChunkedHttpDownloaderIfTorrentIsNotUsed()
         var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
         var torrentDownloader = Substitute.For<ITorrentDownloader>();
 
-        var downloader = new RemoteResourceDownloader(_filePath, resource, false,
+        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, false,
             (path, remoteResource, timeout) => httpDownloader,
             (path, remoteResource, timeout) => chunkedHttpDownloader,
             (path, remoteResource, timeout) => torrentDownloader);
@@ -139,7 +145,7 @@ public void UseHttpDownloaderIfChunksAreNotAvailable()
         var chunkedHttpDownloader = Substitute.For<IChunkedHttpDownloader>();
         var torrentDownloader = Substitute.For<ITorrentDownloader>();
 
-        var downloader = new RemoteResourceDownloader(_filePath, resource, false,
+        var downloader = new RemoteResourceDownloader(_filePath, _metaFilePath, resource, false,
             (path, remoteResource, timeout) => httpDownloader,
             (path, remoteResource, timeout) => chunkedHttpDownloader,
             (path, remoteResource, timeout) => torrentDownloader);

Assets/Editor/Tests/RemoteResourceDownloaderTest.cs

@@ -55,7 +55,7 @@ private void CheckConsistency(string sourceDirPath, string dirPath)
     [Test]
     public void Unarchive()
     {
-        var unarchiver = new Unarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
 
         unarchiver.Unarchive(CancellationToken.Empty);
 
@@ -65,7 +65,7 @@ public void Unarchive()
     [Test]
     public void CancelUnarchive()
     {
-        var unarchiver = new Unarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
 
         CancellationTokenSource source = new CancellationTokenSource();
         source.Cancel();
@@ -76,7 +76,7 @@ public void CancelUnarchive()
     [Test]
     public void UnarchiveCorruptedArchive()
     {
-        var unarchiver = new Unarchiver(TestFixtures.GetFilePath("unarchiver-test/corrupted-zip.zip"), _dirPath);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/corrupted-zip.zip"), _dirPath);
 
         Assert.Catch<Exception>(() => unarchiver.Unarchive(CancellationToken.Empty));
     }
@@ -86,7 +86,7 @@ public void UnarchiveWithPassword()
     {
         string password = "\x08\x07\x18\x24" + "123==";
 
-        var unarchiver = new Unarchiver(TestFixtures.GetFilePath("unarchiver-test/password-zip.zip"), _dirPath, password);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/password-zip.zip"), _dirPath, password);
 
         unarchiver.Unarchive(CancellationToken.Empty);
 
@@ -96,7 +96,7 @@ public void UnarchiveWithPassword()
     [Test]
     public void ProgressReporting()
     {
-        var unarchiver = new Unarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
+        var unarchiver = new ZipUnarchiver(TestFixtures.GetFilePath("unarchiver-test/zip.zip"), _dirPath);
 
         int? lastAmount = null;
         int? lastEntry = null;

Assets/Editor/Tests/UnarchiverTest.cs

@@ -21,13 +21,25 @@ public string GetContentPackagePath(int versionId)
             return Path.PathCombine("-content-" + versionId);
         }
 
+        public string GetContentPackageMetaPath(int versionId)
+        {
+            Checks.ArgumentValidVersionId(versionId, "versionId");
+            return Path.PathCombine("-content-meta-" + versionId);
+        }
+
         public string GetDiffPackagePath(int versionId)
         {
             Checks.ArgumentValidVersionId(versionId, "versionId");
 
             return Path.PathCombine("-diff-" + versionId);
         }
 
+        public string GetDiffPackageMetaPath(int versionId)
+        {
+            Checks.ArgumentValidVersionId(versionId, "versionId");
+            return Path.PathCombine("-diff-meta" + versionId);
+        }
+
         public void Clear()
         {
             DebugLogger.Log("Clearing download data.");

Assets/PatchKit Patcher/Scripts/AppData/Local/DownloadDirectory.cs

@@ -12,12 +12,26 @@ public interface IDownloadDirectory : IWritableDirectory
         /// <param name="versionId">The version id.</param>
         string GetContentPackagePath(int versionId);
 
+        /// <summary>
+        /// Return path to the version content package meta file.
+        /// </summary>
+        /// <param name="versionId"></param>
+        /// <returns></returns>
+        string GetContentPackageMetaPath(int versionId);
+
         /// <summary>
         /// Returns path to the version diff package located in download directory.
         /// </summary>
         /// <param name="versionId">The version id.</param>
         string GetDiffPackagePath(int versionId);
 
+        /// <summary>
+        /// Return path to the version diff package meta file.
+        /// </summary>
+        /// <param name="versionId"></param>
+        /// <returns></returns>
+        string GetDiffPackageMetaPath(int versionId);
+
         /// <summary>
         /// Clears the download data.
         /// </summary>

Assets/PatchKit Patcher/Scripts/AppData/Local/IDownloadDirectory.cs

@@ -0,0 +1,11 @@
+using PatchKit.Unity.Patcher.Cancellation;
+
+namespace PatchKit.Unity.Patcher.AppData.Local
+{
+    public interface IUnarchiver
+    {
+        event UnarchiveProgressChangedHandler UnarchiveProgressChanged;
+
+        void Unarchive(CancellationToken cancellationToken);
+    }
+}

Assets/PatchKit Patcher/Scripts/AppData/Local/IUnarchiver.cs

@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+
+namespace PatchKit.Unity.Patcher.AppData.Local
+{
+    /// <summary>
+    /// Limits the stream to given size in bytes.
+    /// </summary>
+    public class LimitedStream : Stream
+    {
+        private readonly Stream _orig;
+        private long _bytesLeft;
+
+        public LimitedStream(Stream orig, long bytesLimit)
+        {
+            _orig = orig;
+            _bytesLeft = bytesLimit;
+        }
+
+        public override void Flush()
+        {
+            _orig.Flush();
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return _orig.Seek(offset, origin);
+        }
+
+        public override void SetLength(long value)
+        {
+            _orig.SetLength(value);
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            if (_bytesLeft == 0)
+            {
+                return 0;
+            }
+
+            var read = _orig.Read(buffer, offset, (int) Math.Min(_bytesLeft, count));
+            _bytesLeft -= read;
+            return read;
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            _orig.Write(buffer, offset, count);
+        }
+
+        public override bool CanRead
+        {
+            get { return _orig.CanRead; }
+        }
+
+        public override bool CanSeek
+        {
+            get { return _orig.CanSeek; }
+        }
+
+        public override bool CanWrite
+        {
+            get { return _orig.CanWrite; }
+        }
+
+        public override long Length
+        {
+            get { return _orig.Length; }
+        }
+
+        public override long Position
+        {
+            get { return _orig.Position; }
+            set { _orig.Position = value; }
+
+        }
+    }
+}