From 356baf9e793033b06282c5b37d3aec0fd2b9d81b Mon Sep 17 00:00:00 2001 From: Dzejkop Date: Mon, 10 Sep 2018 18:25:55 +0200 Subject: [PATCH 1/4] Update PatchKit.Network.dll From commit 9ede559714b8fdca3747aa30f3219569 in patchkit-network-dotnet --- .../Library/PatchKit.Network.dll | Bin 10240 -> 11776 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Assets/PatchKit Patcher/Library/PatchKit.Network.dll b/Assets/PatchKit Patcher/Library/PatchKit.Network.dll index 89e0dffaec259fd128115de56da0b100ce75d79f..ab41f4cba1e17ff07a4330f40915efe274c71387 100755 GIT binary patch literal 11776 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 jrLumB`}>*+H&C}ov>aYpcf{v!^8Q%4a>?Of Date: Mon, 10 Sep 2018 18:26:25 +0200 Subject: [PATCH 2/4] Remove redundant code --- .../Scripts/Utilities/BytesRangeHelpers.cs | 84 ------------------- 1 file changed, 84 deletions(-) diff --git a/Assets/PatchKit Patcher/Scripts/Utilities/BytesRangeHelpers.cs b/Assets/PatchKit Patcher/Scripts/Utilities/BytesRangeHelpers.cs index 1cf54e29..d3bd3359 100644 --- a/Assets/PatchKit Patcher/Scripts/Utilities/BytesRangeHelpers.cs +++ b/Assets/PatchKit Patcher/Scripts/Utilities/BytesRangeHelpers.cs @@ -54,89 +54,5 @@ public static BytesRange Chunkify(this BytesRange range, ChunksData chunksData) return new BytesRange(bottom, top); } - - /// - /// Limits one range inside the other, examples: - /// 0:-1 contained in range 20:30 becomes 20:30. - /// 0:100 contained in range 50:-1 becomes 50:100 - /// - public static BytesRange ContainIn(this BytesRange range, BytesRange outer) - { - if (Contains(outer, range)) - { - return range; - } - - long start = range.Start; - long end = range.End; - - if (range.Start < outer.Start) - { - start = outer.Start; - } - - if (outer.End != -1) - { - if (range.End == -1 || range.End > outer.End) - { - end = outer.End; - } - } - - return Make(start, end); - } - - /// - /// Localizes one range inside another, the resulting range is limited and local to the relative ("parent") range - /// If the ranges don't overlap, an empty range will be returned. - /// Examples: - /// 50:95 localized within 10:90 becomes 40:-1 - /// 5:15 localized within 10:90 becomes 0:5 - /// - public static BytesRange LocalizeTo(this BytesRange range, BytesRange relative) - { - if (!Overlaps(range, relative)) - { - return Empty(); - } - - long localStart = range.Start >= relative.Start ? range.Start - relative.Start : 0; - long localEnd = range.End <= relative.End ? range.End - relative.Start : -1; - - if (range.End == -1) - { - localEnd = -1; - } - - return Make(localStart, localEnd); - } - - public static bool Overlaps(this BytesRange lhs, BytesRange rhs) - { - return Contains(lhs, rhs) - || Contains(rhs, lhs) - || Contains(lhs, rhs.Start) - || Contains(lhs, rhs.End); - } - - public static bool Contains(this BytesRange outer, BytesRange inner) - { - if (inner.End == -1 && outer.End != -1) - { - return false; - } - - if (inner.Start >= outer.Start) - { - return outer.End == -1 || inner.End <= outer.End; - } - - return false; - } - - public static bool Contains(this BytesRange range, long value) - { - return value >= range.Start && (range.End == -1 || value <= range.End); - } } } \ No newline at end of file From 255caf68f3c9c20d2025b27b38edd4ae41c911fc Mon Sep 17 00:00:00 2001 From: Dzejkop Date: Mon, 10 Sep 2018 18:26:56 +0200 Subject: [PATCH 3/4] Set ReadWriteTimeout to be same as provided timeout --- .../Scripts/AppData/Remote/Downloaders/BaseHttpDownloader.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/BaseHttpDownloader.cs b/Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/BaseHttpDownloader.cs index 46aa914e..a4b95a76 100644 --- a/Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/BaseHttpDownloader.cs +++ b/Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/BaseHttpDownloader.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Net; using JetBrains.Annotations; @@ -79,7 +79,8 @@ public void Download(CancellationToken cancellationToken) { Address = new Uri(_url), Range = _bytesRange, - Timeout = _timeout + Timeout = _timeout, + ReadWriteTimeout = _timeout, }; using (var response = _httpClient.Get(request)) From 3ca5af64ebd1e1350b8735b70246eac65208662d Mon Sep 17 00:00:00 2001 From: Dzejkop Date: Tue, 11 Sep 2018 12:11:49 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bacb745..0f6dea04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Changed +- Patcher will timeout if the downloading stopped sooner than after 5 minutes + ## [3.10.1] ### Fixed - Updated torrent-client to fix the issue with paths with spaces in them