-
Notifications
You must be signed in to change notification settings - Fork 966
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added byte rate calculation functons, closes #296 #314
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ec1b931
Added byte rate calculation functons, closes #296
GeorgeHahn 75bc12b
Tweak byte rate API; finishes implementation for issue #296
GeorgeHahn a797f97
Addressing issues raised in CR
GeorgeHahn 20147cd
Pull changes from upstream, fix merge conflict in release notes
GeorgeHahn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
using System; | ||
using Humanizer.Bytes; | ||
using Humanizer.Localisation; | ||
using Xunit; | ||
using Xunit.Extensions; | ||
|
||
namespace Humanizer.Tests.Bytes | ||
{ | ||
public class ByteRateTests : AmbientCulture | ||
{ | ||
public ByteRateTests() : base("en") { } | ||
|
||
[Theory] | ||
[InlineData(400, 1, "400 B/s")] | ||
[InlineData(4 * 1024, 1, "4 KB/s")] | ||
[InlineData(4 * 1024 * 1024, 1, "4 MB/s")] | ||
[InlineData(4 * 2 * 1024 * 1024, 2, "4 MB/s")] | ||
[InlineData(4 * 1024, 0.1, "40 KB/s")] | ||
[InlineData(15 * 60 * 1024 * 1024, 60, "15 MB/s")] | ||
public void HumanizesRates(long inputBytes, double perSeconds, string expectedValue) | ||
{ | ||
var size = new ByteSize(inputBytes); | ||
var interval = TimeSpan.FromSeconds(perSeconds); | ||
|
||
var rate = size.Per(interval).Humanize(); | ||
|
||
Assert.Equal(expectedValue, rate); | ||
} | ||
|
||
[Theory] | ||
[InlineData(1, 1, TimeUnit.Second, "1 MB/s")] | ||
[InlineData(1, 60, TimeUnit.Minute, "1 MB/min")] | ||
[InlineData(1, 60 * 60, TimeUnit.Hour, "1 MB/hour")] | ||
[InlineData(10, 1, TimeUnit.Second, "10 MB/s")] | ||
[InlineData(10, 60, TimeUnit.Minute, "10 MB/min")] | ||
[InlineData(10, 60 * 60, TimeUnit.Hour, "10 MB/hour")] | ||
[InlineData(1, 10 * 1, TimeUnit.Second, "102.4 KB/s")] | ||
[InlineData(1, 10 * 60, TimeUnit.Minute, "102.4 KB/min")] | ||
[InlineData(1, 10 * 60 * 60, TimeUnit.Hour, "102.4 KB/hour")] | ||
public void TimeUnitTests(long megabytes, double measurementIntervalSeconds, TimeUnit displayInterval, string expectedValue) | ||
{ | ||
var size = ByteSize.FromMegabytes(megabytes); | ||
var measurementInterval = TimeSpan.FromSeconds(measurementIntervalSeconds); | ||
|
||
var rate = size.Per(measurementInterval); | ||
var text = rate.Humanize(displayInterval); | ||
|
||
Assert.Equal(expectedValue, text); | ||
} | ||
|
||
[Theory] | ||
[InlineData(TimeUnit.Millisecond)] | ||
[InlineData(TimeUnit.Day)] | ||
[InlineData(TimeUnit.Month)] | ||
[InlineData(TimeUnit.Week)] | ||
[InlineData(TimeUnit.Year)] | ||
public void ThowsOnUnsupportedData(TimeUnit units) | ||
{ | ||
var dummyRate = ByteSize.FromBits(1).Per(TimeSpan.FromSeconds(1)); | ||
|
||
Assert.Throws<NotSupportedException>(() => | ||
{ | ||
dummyRate.Humanize(units); | ||
}); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
using System; | ||
using Humanizer.Localisation; | ||
|
||
namespace Humanizer.Bytes | ||
{ | ||
|
||
/// <summary> | ||
/// Class to hold a ByteSize and a measurement interval, for the purpose of calculating the rate of transfer | ||
/// </summary> | ||
public class ByteRate | ||
{ | ||
/// <summary> | ||
/// Quantity of bytes | ||
/// </summary> | ||
/// <returns></returns> | ||
public ByteSize Size { get; private set;} | ||
|
||
/// <summary> | ||
/// Interval that bytes were transferred in | ||
/// </summary> | ||
/// <returns></returns> | ||
public TimeSpan Interval { get; private set; } | ||
|
||
/// <summary> | ||
/// Create a ByteRate with given quantity of bytes across an interval | ||
/// </summary> | ||
/// <param name="size"></param> | ||
/// <param name="interval"></param> | ||
public ByteRate(ByteSize size, TimeSpan interval) | ||
{ | ||
this.Size = size; | ||
this.Interval = interval; | ||
} | ||
|
||
/// <summary> | ||
/// Calculate rate for the quantity of bytes and interval defined by this instance | ||
/// </summary> | ||
/// <param name="timeUnit">Unit of time to calculate rate for (defaults is per second)</param> | ||
/// <returns></returns> | ||
public string Humanize(TimeUnit timeUnit = TimeUnit.Second) | ||
{ | ||
TimeSpan displayInterval; | ||
string displayUnit; | ||
|
||
if (timeUnit == TimeUnit.Second) | ||
{ | ||
displayInterval = TimeSpan.FromSeconds(1); | ||
displayUnit = "s"; | ||
} | ||
else if (timeUnit == TimeUnit.Minute) | ||
{ | ||
displayInterval = TimeSpan.FromMinutes(1); | ||
displayUnit = "min"; | ||
} | ||
else if (timeUnit == TimeUnit.Hour) | ||
{ | ||
displayInterval = TimeSpan.FromHours(1); | ||
displayUnit = "hour"; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We shouldn't ignore the unsupported values. |
||
else | ||
throw new NotSupportedException("timeUnit must be Second, Minute, or Hour"); | ||
|
||
return (new ByteSize(Size.Bytes / Interval.TotalSeconds * displayInterval.TotalSeconds)).Humanize() + '/' + displayUnit; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line should move to the development section.
@MehdiK why do you release stuff while other are still developing 😠 :ironic: