diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-01-09 00:48:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 00:48:32 -0500 |
| commit | dbceef97fd070fb0d6096187e7ba60ad3fd924b5 (patch) | |
| tree | d0244b29fc7c94d5a1e80ce34e2f64e92c01f8fc /Emby.Server.Implementations | |
| parent | c986340c02cb0b7fe06569d25a1b5d1c8375f7f6 (diff) | |
| parent | 932fcb0a9cd48696263abedcbfeb4b83cd0d928c (diff) | |
Merge pull request #524 from jellyfin/dev
Master 10.0.1
Diffstat (limited to 'Emby.Server.Implementations')
4 files changed, 4 insertions, 5 deletions
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 241505019..da3a4da07 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -45,7 +45,6 @@ <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" /> <EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" /> <EmbeddedResource Include="Localization\Ratings\*.txt" /> - <EmbeddedResource Include="values.txt" /> </ItemGroup> </Project> diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index b597a935a..a81a0bcbb 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1056,7 +1056,7 @@ namespace Emby.Server.Implementations.LiveTv var numComplete = 0; double progressPerService = _services.Length == 0 ? 0 - : 1 / _services.Length; + : 1.0 / _services.Length; var newChannelIdList = new List<Guid>(); var newProgramIdList = new List<Guid>(); @@ -1262,7 +1262,7 @@ namespace Emby.Server.Implementations.LiveTv } numComplete++; - double percent = numComplete / allChannelsList.Count; + double percent = numComplete / (double) allChannelsList.Count; progress.Report(85 * percent + 15); } @@ -1307,7 +1307,7 @@ namespace Emby.Server.Implementations.LiveTv } numComplete++; - double percent = numComplete / list.Count; + double percent = numComplete / (double) list.Count; progress.Report(100 * percent); } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs index b754d7cb5..95395f96c 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs @@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks foreach (var file in filesToDelete) { - double percent = index / filesToDelete.Count; + double percent = index / (double) filesToDelete.Count; progress.Report(100 * percent); diff --git a/Emby.Server.Implementations/values.txt b/Emby.Server.Implementations/values.txt deleted file mode 100644 index e69de29bb..000000000 --- a/Emby.Server.Implementations/values.txt +++ /dev/null |