michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,036 Commits 2 Branches 79 Tags 73 MiB
8e15142d82
Commit Graph

2334 Commits

Author SHA1 Message Date
artiume
4d324046ac
Merge pull request #14 from jellyfin/master 
nightly
 2020-02-08 21:14:45 -05:00
artiume
c3f749ec66
Update MediaBrowser.Model/Users/UserPolicy.cs 
Co-Authored-By: Anthony Lavado <anthonylavado@me.com>
 2020-02-06 14:02:46 -05:00
artiume
3b6a4c3a33
Merge pull request #11 from jellyfin/master 
nightly
 2020-02-04 06:02:38 -05:00
Bond_009
f47ad85011 Fix warnings MediaBrowser.Model 2020-02-04 01:49:27 +01:00
dkanada
b7a9900556
Merge pull request #2357 from Bond-009/warn13 
Fix warnings
 2020-02-03 17:15:03 +09:00
Bond_009
87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
dkanada
cd13f718fb
Merge pull request #2247 from Bond-009/stringhelper 
Remove StringHelper functions
 2020-02-01 03:29:16 +09:00
Bond-009
6cd9c84ddf
Update MediaBrowser.Model/Extensions/StringHelper.cs 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-01-31 18:10:15 +01:00
artiume
d4470b5709
Merge pull request #9 from jellyfin/master 
nightly
 2020-01-28 21:41:52 -05:00
Bond_009
2186df8ac4 Update deps 2020-01-28 22:42:07 +01:00
Bond-009
04b9e94c7c
Merge pull request #2338 from ferferga/master 
Removed old 'automatic restart after update' features
 2020-01-27 17:02:30 +01:00
Vasily
8c520160cc
Merge pull request #2331 from nyanmisaka/master 
fix an issue that could not correctly determine 'IsSecondaryAudio' in some cases.
 2020-01-27 15:51:50 +03:00
artiume
918df5e352 Merge remote-tracking branch 'jellyfin/master' 2020-01-26 09:33:31 -05:00
ferferga
d6786c7304 Removed old 'automatic restart after update' features' 2020-01-25 23:01:48 +01:00
Nyanmisaka
48e9c004b4
fix an issue about determining 'IsSecondaryAudio' 
fix an issue that could not correctly determine 'IsSecondaryAudio' in some cases.
 2020-01-24 00:55:14 +08:00
Bond-009
c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Bond_009
ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +01:00
Bond-009
686d1ff9fb
Update StringHelper.cs 2020-01-16 23:23:06 +01:00
Bond-009
47d3337124
Update StringHelper.cs 2020-01-16 23:22:42 +01:00
Vasily
3ab979c6ba
Merge pull request #2264 from Bond-009/discovery 
Clean up server discovery code
 2020-01-15 13:34:29 +03:00
Bond_009
976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond_009
84d1b12530 Attempt #2 2020-01-12 21:55:04 +01:00
Bond-009
ded9857f45 Clean up server discovery code 2020-01-12 18:59:10 +01:00
dkanada
a272638a84
Merge pull request #2170 from Bond-009/mediainfoservice 
Minor changes to MediaInfoService
 2020-01-11 16:54:23 +09:00
Bond_009
b50c4938e1 Merge branch 'master' into namingtests 2020-01-09 18:26:22 +01:00
Artiume
a40cb7bbd8
Merge pull request #7 from jellyfin/master 
nightly
 2020-01-09 12:14:54 -05:00
Bond-009
fdbb329118 Remove StringHelper functions 2020-01-09 17:07:13 +01:00
dkanada
73fac50e57 rename two properties based on code suggestions 2020-01-08 10:52:48 +09:00
Bond_009
8a0ef41036 Minor improvements 2020-01-08 01:24:12 +09:00
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Bond_009
5751d86536 Fix warnings and move to System.Text.Json 2019-12-20 21:49:16 +01:00
Artiume
6a6e02e1ec
Merge pull request #3 from jellyfin/master 
nightly, big one
 2019-12-19 20:51:45 -05:00
Bond-009
6b185119aa
Merge branch 'master' into namingtests 2019-12-17 17:35:27 +01:00
Artiume
77fc77eb82
Update UserPolicy.cs 2019-12-15 23:59:46 -05:00
Bond-009
baadb504bb Merge branch 'master' into mediaencoding 2019-12-12 16:34:34 +01:00
Joshua M. Boniface
9744f5aee3
Merge pull request #2118 from chaosinnovator/master 
Add StartIndex result to /Items API query
 2019-12-11 23:42:02 -05:00
Bond_009
0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
chaosinnovator
b98e25a07e Add StartIndex result to /Items API query 2019-12-10 09:30:44 -08:00
Bond_009
35151553e3 Add back all old emby tests 2019-12-06 20:41:39 +01:00
Bond_009
cc5acf37f7 Make probesize and analyzeduration configurable and simplify circular 
dependencies

Makes the probesize and analyzeduration configurable with env args.
(`JELLYFIN_FFmpeg_probesize` and `FFmpeg_analyzeduration`)
 2019-11-25 12:07:59 +01:00
Bond_009
3221e837f9 * Add support for multi segment base urls 
* Make baseurl case-insensitive
 2019-11-25 11:55:24 +01:00
dkanada
51cdc6ea16
Merge pull request #1926 from Bond-009/auth 
Add clearer exceptions, warnings and docs
 2019-11-23 01:14:32 +09:00
dkanada
37eed8cf1f revert settings to their old names 2019-11-21 21:55:10 +09:00
dkanada
b1f9b03b17 rename some missed variables and fix warnings 2019-11-21 21:55:10 +09:00
Bond-009
983d38a43b Merge branch 'master' into installationmanager 2019-11-07 10:50:55 +01:00
Andrew Mahone
1600d5b53f Merge remote-tracking branch 'origin/master' into media-attachments-clean 2019-11-04 10:03:18 -05:00
Erwin de Haan
45a670f15b Revert the project inclusion that created a cycle. 2019-11-03 16:40:35 +01:00
Erwin de Haan
387051c409 Fix the last docs warnings. 2019-11-03 15:52:10 +01:00
Bond_009
d529f81cd9 Improve IInstallationManager interface 2019-11-01 17:57:19 +01:00
Bond_009
3f7836d9eb Update deps and add MultiThreading analyzer 2019-11-01 17:55:44 +01:00
Bond_009
d9a03c9bb1 Fix more warnings 2019-10-29 17:55:16 +01:00
Andrew Mahone
01b1c847e9 Provide delivery URLs for attachments in PlaybackInfo. 2019-10-22 11:54:59 -04:00
Andrew Mahone
321e5cba60 Add new MediaAttachment to store attachments found during media probing. 2019-10-22 10:30:55 -04:00
Bond_009
fef35d0505 Add clearer exceptions, warnings and docs 2019-10-20 21:12:03 +02:00
Bond_009
5edb8159a7 Fix Json serialization error 2019-10-15 17:49:49 +02:00
Joshua Boniface
345a14ff55 Use value instead of assigning baseUrl first 2019-10-09 10:52:51 -04:00
Joshua Boniface
b10e06ff45 Fix spacing issues 2019-10-09 10:40:52 -04:00
Joshua Boniface
2a79ae0a6e Normalize baseUrl behaviour 
Fully normalizes the baseUrl behaviour to better match how this sort of
feature works in other programs.

1. The baseUrl is always appended to paths, even the built-in `/emby`
and `/mediabrowser` paths.
2. The baseUrl is set statically at class instance creation, to ensure
it persists through changes until the next restart.
3. Configuration is normalized using a function when set, to ensure it's
in a standard `/mypath` format with leading `/`.
4. Cleans up the conditionals around default redirects. For sanity after
changing the URL, it will match *any* path that doesn't match the
current baseUrl and redirect it back to the main page (with baseUrl).
5. Adds a second method, NormalizeUrlPath, to avoid lots of `+ "/" +`
string manipulations which are unclean - we should always have a leading
slash.
6. Sets the default baseUrl to an empty string to avoid unexpected
behaviour, though this would be worked-around automatically.
7. Adds some debug logs whenever a URL is normalized, to help track down
issues with this code (if any arise).
 2019-10-08 18:06:03 -04:00
Joshua M. Boniface
2d797adc08
Merge pull request #1773 from sparky8251/remove-wan-ddns 
Remove WAN DDNS
 2019-09-28 18:08:24 -04:00
Joshua M. Boniface
c069496b27
Merge pull request #1770 from sparky8251/remove-wan-ip 
Remove WAN IP Detection
 2019-09-28 18:08:10 -04:00
sparky8251
14f563d7c2 Removed WAN DDNS 
It's odd that JF still had code lying around for generating a self signed cert. Currently, it does not do this so this code has been removed.

JF also appears to have functions in place to modify provided certs? Warrants deeper investigation. JF should not be attempting modifications of any certs under any circumstance.
 2019-09-19 15:56:54 -04:00
sparky8251
44a3e0a97b Hide new users from public API by default 2019-09-19 15:16:57 -04:00
sparky8251
0562b4cf6f Remove WAN IP Detection 2019-09-19 10:55:58 -04:00
Bond-009
6f17a0b7af Remove legacy auth code (#1677) 
* Remove legacy auth code

* Adds tests so we don't break PasswordHash (again)
* Clean up interfaces
* Remove duplicate code

* Use auto properties

* static using

* Don't use 'this'

* Fix build
 2019-09-17 12:07:15 -04:00
Bond-009
221b831bb2 Reset invalid login counter on successfull login 2019-09-13 17:18:45 +02:00
Bond_009
675754bc5c Possible fix for MrMC 2019-09-08 21:07:29 +02:00
Bond-009
ee637e8fec Fix warnings, improve performance (#1665) 
* Fix warnings, improve performance

`QueryResult.Items` is now a `IReadOnlyList` so we don't need to
allocate a new `Array` when we have a `List` (and `Items` shouldn't need to
be mutable anyway)

* Update Providers .csproj to latest C#

* Remove extra newline from DtoService.cs

* Remove extra newline from UserLibraryService.cs
 2019-09-02 02:19:29 -04:00
Anthony Lavado
cb393c215a
Merge pull request #1686 from Bond-009/warn7 
More warning fixes
 2019-09-02 02:07:19 -04:00
Bill Thornton
3a600687ea Restore flac mime type 2019-09-01 01:15:34 -04:00
Bond_009
e4f893a0eb More warning fixes 2019-08-29 22:28:33 +02:00
Bond_009
efc4805233 Fix login 2019-08-28 14:45:46 +02:00
Joshua M. Boniface
d95c04787c
Merge branch 'master' into h265 2019-08-19 14:57:48 -04:00
dkanada
25a590e8cd
Merge pull request #1636 from Bond-009/isomounter 
Add analysers to Emby.IsoMounting and enable TreatWarningsAsErrors
 2019-08-18 03:19:27 -07:00
Bond_009
237db8ae92 Clean up livestreaming code 2019-08-16 21:13:18 +02:00
Bond_009
dc662beefe Add analysers to Emby.IsoMounting and enable TreatWarningsAsErrors 2019-08-16 21:03:45 +02:00
Anthony Lavado
7a27dd8a1b
Merge pull request #1632 from Bond-009/locale 
Improve LocalizationManager
 2019-08-16 14:17:01 -04:00
Anthony Lavado
af3c4e0ce8
Merge pull request #1588 from dkanada/url 
Add base url option to server configuration
 2019-08-16 14:16:18 -04:00
Bond_009
c699c546e4 Improve LocalizationManager 2019-08-16 17:31:47 +02:00
dkanada
bb04545068
Merge pull request #1614 from Bond-009/docs2 
Document all public/internal members of Emby.Drawing
 2019-08-15 21:01:44 -07:00
dkanada
685e9e4f58
Merge pull request #1584 from Bond-009/checksum 
Check checksum for plugin downloads
 2019-08-15 01:00:33 -07:00
dkanada
8f8d8e3d0b
Merge pull request #1581 from Bond-009/socket1 
Use System.Net abstractions instead of raw socket
 2019-08-13 19:58:57 -07:00
Bond_009
838e5d05d5 Document all public/internal members of Emby.Drawing 
Forces all new public/internal members to be documented.
Enables TreatWarningsAsErrors for Emby.Drawing
 2019-08-11 16:52:37 +02:00
Bond_009
5eaf5465a5 Check checksum for plugin downloads 
* Compare the MD5 checksum when downloading plugins
* Reduced log spam due to http requests
* Removed 'GetTempFileResponse' function from HttpClientManager
* Fixed caching for HttpClientManager
 2019-08-11 15:54:58 +02:00
dkanada
1ad67e223f
Merge pull request #1462 from Bond-009/installationmanager 
Improvements to InstallationManager
 2019-08-11 03:47:10 -07:00
dkanada
d521e5c36a add base url to server configuration 2019-08-11 00:35:18 -07:00
Joshua M. Boniface
a96fa7a5c7
Merge pull request #1397 from Bond-009/passfast 
Streamline authentication proccess
 2019-08-10 21:42:46 -04:00
dkanada
5c366e4697
Merge pull request #1612 from Bond-009/warn4 
Fix warnings
 2019-08-10 15:12:54 -07:00
Bond_009
2a58c643d2 Fix more warnings 2019-08-09 23:16:24 +02:00
Bond_009
1cad93c276 Use System.Net abstractions instead of raw socket 2019-08-09 22:38:31 +02:00
Bond_009
cf7290343f Fix build 2019-08-09 22:36:20 +02:00
Bond_009
9fff4b060e Replace custom code with Asp.Net Core code 2019-08-09 22:36:20 +02:00
Bond-009
8b1bd7ac6b Use a dictionary to look up mimetypes 2019-07-28 20:20:03 +02:00
Bond_009
ddd1a282ea Remove IpAddressInfo and IpEndPointInfo classes 2019-07-25 00:15:06 +02:00
Bond_009
0f897589ed Streamline authentication proccess 2019-07-06 14:52:24 +02:00
Bond_009
65a0ca2f32 Improvements to InstallationManager 2019-06-14 18:38:14 +02:00
Bond_009
defc5f1cf9 Force LF line endings 2019-06-08 19:56:08 +02:00
Anthony Lavado
d7aaa1489c
Merge pull request #1427 from dkanada/fanart 
Move fanart image provider to plugin
 2019-06-05 01:19:54 -04:00
Anthony Lavado
f631b2ecdc
Merge pull request #1159 from Bond-009/streamjob 
Trying to make sense of the streaming code
 2019-06-04 00:20:43 -04:00
Frank
3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
dkanada
09dfa071dc move fanart image provider to plugin 2019-05-31 01:48:20 -07:00
Bond-009
d9c159122f
Merge pull request #1229 from voodoos/cleanup/SocketSharp 
Cleaning WebSocketSharp continued
 2019-05-09 17:16:51 +02:00
Anthony Lavado
2f0719a883
Move the definition of ProductName to the correct class 
Missed moving this from one class to the other.
 2019-04-16 01:38:00 -04:00
VooDooS
a6e1b23eb0 Simplify headers use in WSS 2019-04-11 17:49:14 +02:00
Bond_009
93e535d3a1 Trying to make sense of the streaming code 
Mostly small changes as I was looking through the code.

* async void -> async Task
* Properly implemented dispose methods
* Pass the logstream directly to the JobLogger
* Style fixes
 2019-03-26 23:00:14 +01:00
Phallacy
09921a00aa made password resets an interface and per user 2019-03-22 00:01:23 -07:00
Joshua M. Boniface
fc79659549
Merge pull request #1127 from LogicalPhallacy/lockoutfix 
Add configurable user lockout
 2019-03-18 21:13:51 -04:00
redSpoutnik
480a6607e2
Merge branch 'master' into subtitle-display-title 2019-03-16 17:54:57 +01:00
redSpoutnik
4a30fee40d Remove some dead code 2019-03-16 17:28:45 +01:00
LogicalPhallacy
9df1506794
Merge pull request #2 from LogicalPhallacy/master 
update lockoutfix to latest for testing
 2019-03-16 00:26:12 -07:00
Phallacy
1ee016c997 configurable user lockout 2019-03-16 00:18:52 -07:00
redSpoutnik
427688a0a0 Change subtitles DisplayTitle behavior 2019-03-14 22:31:51 +01:00
Erwin de Haan
21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Erwin de Haan
ee7bf86e0f Adjusted the Product Name so the User Agent is correct/better. 2019-03-14 22:11:47 +01:00
Bond-009
e64aaebbac Improvements around streams 
* Use ArrayPool instead of allocating new buffers each time
* Remove NetworkStream copy
* Remove some dead code
 2019-03-13 21:11:01 +01:00
Vasily
297f25cfc2
Merge pull request #1059 from Bond-009/os 
Remove EnvironmentInfo
 2019-03-13 00:01:00 +03:00
Joshua M. Boniface
6751560228
Merge pull request #1092 from joshuaboniface/configurable-webdir 
Add configurable webdir option
 2019-03-12 12:51:11 -04:00
Bond-009
3ddbda9aca
Merge branch 'master' into xml 2019-03-12 16:37:18 +01:00
Vasily
1fef8bf266
Merge pull request #1060 from Bond-009/assinfo 
Remove redundant class AssemblyInfo
 2019-03-12 16:34:21 +03:00
Joshua Boniface
3c4043199a Implement review feedback 2019-03-12 09:18:45 -04:00
Joshua Boniface
132ce3ece1 Add further resources to complete WebPath 2019-03-10 17:04:18 -04:00
Bond-009
decaffed86 Remove EnvironmentInfo 
This moved the last bit of usefulness of EnvironmentInfo into a static
class.
 2019-03-07 22:41:41 +01:00
Bond-009
669c48cc8b
Merge pull request #1065 from cvium/closed_response 
Don't set status code if response is closed
 2019-03-07 22:32:01 +01:00
Claus Vium
3fa43a1e08 Don't set status code if response is closed 2019-03-07 22:26:23 +01:00
Bond-009
c5fce647de Cleanup/simplification 
* Removed useless copies/allocations
* Reduced unneeded complexity
 2019-03-07 21:13:13 +01:00
Claus Vium
0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01:00
Bond-009
ae0ecc1b10
Merge pull request #870 from LogicalPhallacy/betterauth 
Better default authentication
 2019-03-07 19:11:36 +01:00
Claus Vium
8c609bc9ce Reduce aspnet imports 2019-03-07 19:04:09 +01:00
Bond-009
e91dd14b31 Remove redundent class AssemblyInfo 2019-03-07 18:10:55 +01:00
Phallacy
8f4895e8a5 more fixes for perf and style 2019-03-07 03:11:41 -08:00
Bond_009
a9302b8b53 Remove useless abstraction around XmlReaderSettings 
This removes the amount of stuff that needs to be passed around
Also removes some unneeded `ManagedFileSystem` usage
 2019-03-07 12:04:14 +01:00
Bond-009
c31b0b311b
Apply suggestions from code review 
more minor fixes before I do larger fixes

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
 2019-03-07 02:41:44 -08:00
Phallacy
bef665be36 Minor fixes to address style issues 2019-03-05 23:45:05 -08:00
PloughPuff
656bffbbb2 Remove --ffprobe logic 2019-03-05 21:29:15 +00:00
PloughPuff
8104e739d5 Address review comments from Bond 2019-03-05 21:29:15 +00:00
PloughPuff
ed69e690b8 Review comments 
Address review comments from JustAMan, Bond-009 and cvium.
 2019-03-05 21:29:15 +00:00
PloughPuff
20775116f7 Reworked FFmpeg path discovery and always display to user 
1) Reworked FFmpeg and FFprobe path discovery (CLI switch, Custom xml, system $PATH, UI update trigger).  Removed FFMpeg folder from Emby.Server.Implementations.  All path discovery now in MediaEncoder.

2) Always display FFmpeg path to user in Transcode page.

3) Allow user to remove a Custome FFmpeg path and return to using system $PATH (or --ffmpeg if available).

4) Remove unused code associated with 'prebuilt' FFmpeg.

5) Much improved logging during path discovery.
 2019-03-05 21:24:54 +00:00
Claus Vium
446f9bf81f Remove more Content-Length references 2019-03-05 20:48:04 +01:00
Phallacy
2c26517172 minor style fixes 2019-03-04 23:58:25 -08:00
The Lynxy
c84729a4f4
Do not allow new users to delete content by default 2019-02-28 07:50:32 -05:00
Claus Vium
1e97e4d462 Remove IHttpResponse 2019-02-27 14:29:44 +01:00
Claus Vium
27e7e792b3 Replace some usage of QueryParamCollection 2019-02-27 14:23:39 +01:00
Claus Vium
91afaaf8fe Cleanup in QueryParamCollection 2019-02-27 12:45:06 +01:00
Claus Vium
333bd2107a Remove HttpUtility 2019-02-27 12:40:18 +01:00
Claus Vium
25d3d0b731 Remove some unused stuff 2019-02-27 08:02:32 +01:00
Claus Vium
5510e8ebee Remove unused Cookies 2019-02-26 22:53:59 +01:00
Claus Vium
f1c93ae618 Remove SetContentLength and company 2019-02-26 22:11:21 +01:00
Claus Vium
852460b991 kestrel init 2019-02-26 22:11:21 +01:00
Claus Vium
4db31acff9 Begin removing System.Net sources 2019-02-26 22:11:21 +01:00
Xu Fasheng
cbd0e71c07 Send DLNA devices message to only the matched interface 
This will be the right way for multiple interfaces, or the client will
receive all devices message with different IP addresses and could not
detect which one could access.

And provide one option DlnaOptions.SendOnlyMatchedHost to fallback to old
behaviour if this commit missed something.
 2019-02-22 20:18:34 +08:00
Xu Fasheng
cf4e64f430 Add option to toggle if ignore virtual interfaces 
Some VPN like ZerotierOne owns IP address but no gateway, and there is no
good idea in NetworkManager.GetIPsDefault() to filter such virtual interfaces,
so just provide one option to let user decide it.
 2019-02-22 20:13:17 +08:00
Phallacy
a0d31a49a0 merging with master to clear merge conflict 2019-02-20 00:46:13 -08:00
Phallacy
6bbb968b57 minor changes and return to netstandard 2019-02-20 00:00:26 -08:00
Joshua M. Boniface
89d4ce309d
Merge pull request #848 from Bond-009/perf 
Minor changes to reduce allocations
 2019-02-19 21:24:51 -05:00
Joshua M. Boniface
b43317c5e1
Merge pull request #830 from Bond-009/update 
Removed remaining self-update code
 2019-02-19 21:21:36 -05:00
Vasily
13f2783a8e
Merge pull request #887 from wtayl0r/replace-primitives-with-iconfiguration 
Replace primitive injection with IConfiguration
 2019-02-18 19:30:11 +03:00
Bond_009
7554f63551 Remove more self-update code 2019-02-18 16:57:08 +01:00
Bond_009
77a5617774 Removed remaining self-update code 2019-02-18 16:57:08 +01:00
Phallacy
48e7274d37 added justaman notes, fixed new bug from emty has removals 2019-02-18 01:26:01 -08:00
William Taylor
18ae107ce4 Removed unnecessary configuration options and reduced primitive dependencies 2019-02-17 14:09:52 +00:00
Bond-009
a35ea49c99 Merge remote-tracking branch 'upstream/release-10.2.z' into newmaser 2019-02-17 10:38:44 +01:00
Bond-009
4811e76860
Merge branch 'master' into perf 2019-02-16 17:05:44 +01:00
Phallacy
77602aff88 Minor fixes re:PR870, added null checks from PR876 2019-02-13 00:33:00 -08:00
Bond_009
8d98885cda Less string allocations 2019-02-12 21:06:47 +01:00
Bond_009
81a8ebde22 Move to Microsoft.Extensions.DependencyInjection 
This PR replaces SimpleInjector with
Microsoft.Extensions.DependencyInjection.
 2019-02-12 20:52:23 +01:00
William Lees
d18823ced1 Fix potential NullReferenceException 2019-02-12 23:28:02 +11:00
Phallacy
05bbf71b6d sha256 with salt auth and sha1 interop 2019-02-12 02:16:03 -08:00
LogicalPhallacy
8bf88f4cb2
Merge pull request #9 from jellyfin/master 
Yanking in latest changes
 2019-02-11 22:48:50 -08:00
Bond-009
e216702bcf Complete rename ImageSize -> ImageDimensions 2019-02-05 19:53:50 +01:00
Claus Vium
0ef2b46106 Remove custom Threading 2019-02-05 16:47:50 +01:00
Joshua M. Boniface
56dcc45dc0
Merge pull request #732 from Bond-009/locale 
Reworked LocalizationManager to load data async
 2019-02-03 22:08:20 -05:00
Bond_009
1385d89df6 Remove MoreLINQ 2019-02-02 12:27:06 +01:00
Joshua M. Boniface
c713824bf9
Merge pull request #734 from Bond-009/culture 
Fix more analyzer warnings
 2019-01-31 21:11:13 -05:00
Claus Vium
8985fb8d58 Remove support for games as a media type 2019-01-31 19:04:47 +01:00
Claus Vium
f7a46c7a56 Remove more Connect related stuff 2019-01-31 18:47:50 +01:00
Bond-009
2a1f6361a5
Merge branch 'master' into locale 2019-01-31 18:44:36 +01:00
Phallacy
4519ce26e2 Upgrade crypto provider, retarget better framework 2019-01-31 00:24:53 -08:00
Bond-009
1ea219bf3f
Merge branch 'master' into culture 2019-01-30 16:57:15 +01:00
Erwin de Haan
d3afa53191 Final refactored IFileSystem and ManagedFileSystem 2019-01-28 22:10:52 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Bond_009
51edd5d067 Reworked LocalizationManager to load data async 2019-01-27 10:36:05 +01:00
Andrew Rabert
4190410c7e
Merge pull request #710 from Bond-009/spelling 
Fix a spelling mistake
 2019-01-26 14:13:47 -05:00
Andrew Rabert
b673054c8d
Merge pull request #711 from Bond-009/sysevent 
Remove remnants of system events
 2019-01-26 14:13:25 -05:00
Bond_009
883575893b Change image dimentions from double to int 
Rename ImageSize -> ImageDimensions
 2019-01-26 13:16:47 +01:00
Erwin de Haan
d1a0497f55 Revert "Merge pull request #452 from Bond-009/activitydb" 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
 2019-01-25 23:32:06 +01:00
Bond_009
fd7f420af2 Remove remnants of system events 2019-01-25 22:41:43 +01:00
Bond_009
eaa6cb0ddc Fix a spelling mistake 2019-01-25 22:27:33 +01:00
Bond_009
905a253ff5 Suffix async methods with Async 2019-01-23 19:09:34 +01:00
Bond_009
f6f0a8a481 Use EF Core for Activity database 2019-01-23 16:39:12 +01:00
Bond_009
2f8f9e6853 Address comments 2019-01-21 16:57:10 +01:00
Bond_009
06d9423f00 Clean up last bits 2019-01-21 16:48:45 +01:00
Bond_009
37be6c87eb Make ConditionProcessor static 2019-01-21 16:48:45 +01:00
Bond_009
c9b88ab741 Clean up streambuilder 2019-01-21 16:48:45 +01:00
cvium
b35dcbb9f0 Remove MediaBrowser.Text since it violates licenses and is overall hacky 2019-01-20 06:30:50 +01:00
Erwin de Haan
924ec0c191 Revert Jellyfin.Versioning, Update all versions and user agents. 2019-01-20 01:12:44 +01:00
Erwin de Haan
bb8df8dfa0 Updates reported version in System/Info* set of endpoints. 
Added ProductName and ServerVersion to API.

Added build version and build step. Addressed issues wtih indentation.

Made the BuildVersion an actual object. This lets up link to the github page of that commit.

Fixed class method type and styled link.

Fixed languages and split out the information in the UI.

Moved update-version script and gave it executable permissions. Windows correctly finds the .bat file. And linux takes the one without extension.

Removed tempfiles from replace sessions from csproj.

Updated version generation scripts. Will also work with pre existing version files. (Source tarballs etc.)

Added simple replace for ssh github links.

Add execute rights to update-version.

Wrapped long line in ApplicationHost.cs

Fixed some small issues.

Fixed some small issues, and flipped some if's around.

Converted parameter names to camelBack casing.

Sealed the attribute class.

Removed MPLv2 license.

Fixed file headers.

Added newline.

Moved links in *.csproj files as well.

Fix issues caused by rebase auto merging.

Removed default constructor and added init values to properties, also hid the Remote value form API.
 2019-01-20 00:28:48 +01:00
Erwin de Haan
c5430f86b0 Fixed csproj and xml identation. 2019-01-19 15:01:16 +01:00
Erwin de Haan
38f96af079 Reformat JustAMan review pt2 changes 
Refs #575
 2019-01-17 20:24:39 +01:00
Erwin de Haan
49b61f238e Merge branch 'dev' into reformat 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
 2019-01-15 17:34:39 +01:00
Claus Vium
eca3c099d9 removed a bunch of validation, security, registration, premiere, whatever bs 2019-01-15 16:48:21 +01:00
Erwin de Haan
e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Erwin de Haan
65bd052f3e ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
089ad8e7c2 Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
Erwin de Haan
8f41ba4d3a Find+Sed BOM removal *.cs: MediaBrowser.LocalMetadata-MediaBrowser.Model 2019-01-13 21:02:23 +01:00
Erwin de Haan
742bef5b5f EditorConfig reformat: Non-CS files. 2019-01-13 20:45:51 +01:00
Erwin de Haan
382e8699a2 EditorConfig reformat: MediaBrowser.Model 2019-01-13 20:31:15 +01:00
Erwin de Haan
1a4b271314 Visual Studio Reformat: MediaBrowser.Model 2019-01-13 20:26:15 +01:00
Joshua M. Boniface
9dcaafe700 Merge pull request #458 from EraYaN/code-cleanup 
Clean up several minor issues and add TODOs
 2019-01-13 12:14:53 -05:00
Bond_009
3a2a0fbfe8 Add more NuGet metadata properties 
Remove old nuspec files
 2019-01-13 11:57:33 +01:00
Erwin de Haan
e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Joshua M. Boniface
15c89d281e Merge pull request #506 from hawken93/linting 
Removing tabs and trailing whitespace
 2019-01-10 19:54:18 -05:00
Erwin de Haan
ec1f5dc317 Mayor code cleanup 
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
 2019-01-10 20:38:53 +01:00
Andrew Rabert
3d867c2c46 Merge pull request #516 from Bond-009/env 
Remove useless properties from IEnvironmentInfo
 2019-01-09 22:08:58 -05:00
Joshua M. Boniface
61aeb0e9a8 Merge pull request #486 from Bond-009/plugins 
Add NuGet package info to plugin projects
 2019-01-08 18:10:09 -05:00
Bond_009
f520ddc966 Remove useless properties from IEnvironmentInfo 2019-01-08 17:35:56 +01:00
hawken
bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
hawken
ba1794f64b Remove tabs and trailing whitespace 2019-01-07 23:24:34 +00:00
Joshua M. Boniface
4ab82f7436 Merge pull request #488 from sparky8251/fix-mimetype-formatting 
Fix odd formatting in MimeType.cs
 2019-01-07 11:25:43 -05:00
Sparky
ae4a82570c Fixed odd formatting in MimeType.CS 
Think there might have been a mismatch between tabs and spaces. All spaces now.
 2019-01-07 11:23:11 -05:00
Sparky
1f5b9a04fb Open log files in browser again 
Fixes #485

Looks like we regressed and now only the .txt logs would open in the browser when clicked. 

Added in MimeType handler for .log files. Problem solved.
 2019-01-07 11:19:59 -05:00
Bond_009
e1379610e5 Ground work to get plugins functional again 2019-01-07 16:58:33 +01:00
Andrew Rabert
edfc3cb8c6 Merge pull request #437 from cvium/remove_run_at_startup 
Remove AutoRunAtStartup
 2019-01-06 18:31:20 -05:00
Andrew Rabert
12112ea25d Remove more news 2019-01-06 17:52:51 -05:00
Bond_009
c07d5a6963 Remove unused PowerManagement 
It isn't up to the application to prevent the system from going to sleep
 2019-01-06 12:55:48 +01:00
Joshua Boniface
1ccc0131a5 Readd System import to correct Array failure 2019-01-05 20:21:22 -05:00
Anthony Lavado
f2fedb9f34 Merge pull request #383 from Bond-009/unused 
Remove firebase and empty resource config file
 2019-01-05 23:06:08 +00:00
cvium
bb879fff33 Remove AutoRunAtStartup 2019-01-05 23:07:06 +01:00
Bond_009
340a2c6512 Post GPL cleanup 2019-01-03 23:19:02 +01:00
Bond_009
30a19d345a Remove report usage configuration option 2019-01-03 21:05:17 +01:00
Bond_009
db62648510 Remove firebase and empty resource config file 2019-01-03 19:51:18 +01:00
Anthony Lavado
a06a5c8d18 Merge branch 'dev' into project-updates 2019-01-02 14:02:48 -05:00
Claus Vium
07e7b13b75 change userid type to guid 2019-01-02 10:55:05 +01:00
Anthony Lavado
87812d1e7f Fix spacing to C#/Visual Studio standards 
- This is a fix automatically applied by Visual Studio
 2019-01-02 01:22:21 -05:00
Bond_009
75efe9cf0a Rename and rework entry point 2019-01-02 02:30:59 +03:00
Claus Vium
cff0ece073 set EnableAnonymousUsageReporting to false to avoid log spam (#348) 
It's the default value for the setting, so it'll only affect new servers. If enabled, it'll send usage statistics to an endpoint that doesn't exist, which just clutters the console/logs.
 2019-01-01 14:33:22 +03:00
Bond_009
a8fde5e89c Readded some stuff 2018-12-30 22:44:38 +01:00
Bond_009
0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
Andrew Rabert
4929ee9ab6 Fix default language 
The default preferred language in the startup wizard now defaults to
English (United States).
 2018-12-28 17:06:45 -05:00
Bond_009
6e5d2aadaa Remove custom ToArray extension 2018-12-28 16:48:26 +01:00
Andrew Rabert
a86b71899e Add GPL modules 2018-12-27 18:27:57 -05:00
stefan
48facb797e Update to 3.5.2 and .net core 2.1 2018-09-12 19:26:21 +02:00
Luke Pulverenti
85815adcd2 update live tv queries 2017-12-05 13:30:49 -05:00
Luke Pulverenti
175c085d90 Stub out new filtering api 2017-12-03 17:15:21 -05:00
Luke Pulverenti
8717f81bf4 Add setting to auto-run web app when server starts 2017-12-03 17:14:35 -05:00
Luke Pulverenti
c4ceeae889 improve xmltv gz support 2017-12-03 17:11:04 -05:00
Luke Pulverenti
5207067811 fix live tv over dlna 2017-11-29 15:50:18 -05:00
Luke Pulverenti
58a7829ecd update library changed notifier 2017-11-25 23:48:12 -05:00
Luke Pulverenti
4f09c1e06d reduce dlna chatter 2017-11-23 10:46:16 -05:00
Luke Pulverenti
77695f8abe 3.2.40.1 2017-11-21 17:14:56 -05:00
Luke Pulverenti
43cb11f694 update shared stream support 2017-11-18 23:59:34 -05:00
Luke Pulverenti
1dc8ff9e91 allow specification of m3u stream limit 2017-11-17 16:54:33 -05:00
Luke Pulverenti
351d29954a 3.2.36.8 2017-11-12 16:05:40 -05:00
Luke Pulverenti
711f588084 3.2.36.7 2017-11-10 16:22:38 -05:00
Luke Pulverenti
901d7b509c update play media source feature 2017-11-09 15:58:09 -05:00
Luke Pulverenti
25138bbeb7 update subtitle downloading to use local metadata settings 2017-11-08 15:23:39 -05:00
Luke Pulverenti
83a43121af fix hdhr stream returning too quickly 2017-11-06 16:32:44 -05:00
Luke Pulverenti
5cb7469028 support track selection before playback 2017-11-05 16:51:23 -05:00
Luke Pulverenti
d765f370b3 update librarymanager 2017-11-01 15:56:20 -04:00
Luke Pulverenti
0a0303ca64 normalize strm file contents 2017-11-01 15:50:16 -04:00
Luke Pulverenti
8ec8b46394 allow separate configuration of date format 2017-10-30 00:51:43 -04:00
Luke Pulverenti
93676f6838 revise unknown audio stream handling 2017-10-28 23:52:05 -04:00
Luke Pulverenti
5106819a4b show album artist in album identify wizard 2017-10-28 00:20:18 -04:00
Luke Pulverenti
ca2e7a4195 deprecate localized guids config switch 2017-10-26 23:49:56 -04:00
Luke Pulverenti
12adc7ae4c add additional info to timer infos 2017-10-18 21:19:48 -04:00
Luke Pulverenti
4ef9f68837 support delete per library 2017-10-16 02:10:55 -04:00
Luke Pulverenti
9fdaa039c4 rework device repository 2017-10-13 15:18:05 -04:00
Luke Pulverenti
c583d49541 live tv subtitle fixes 2017-10-13 14:32:58 -04:00
Luke Pulverenti
bc656edf4f update resolved video titles 2017-10-13 01:44:20 -04:00
Luke Pulverenti
e19b8f81c7 update recording conversion 2017-10-07 02:13:26 -04:00
Luke Pulverenti
51ca72ab5d adjust default provider order 2017-10-05 14:10:07 -04:00
Luke Pulverenti
4e4c145855 update hls query string 2017-09-29 16:10:13 -04:00
Luke Pulverenti
878abbddda fixes #1427 - [Feature Request]: Require Encryption 2017-09-29 15:17:54 -04:00
Luke Pulverenti
a0d82a02c8 update param encoding 2017-09-26 13:09:42 -04:00
Luke Pulverenti
d43508a898 update applyconditions 2017-09-25 15:15:01 -04:00
Luke Pulverenti
978eedbcb7 improve support for compressed xmltv 2017-09-25 01:06:15 -04:00
Luke Pulverenti
de5a8d579b move season zero display name to per library settings 2017-09-24 16:23:56 -04:00
Luke Pulverenti
39394e74c7 fix dlna direct play on samsung tv's 2017-09-23 21:03:46 -04:00
Luke Pulverenti
f3120dbee9 fix application of params 2017-09-22 16:38:59 -04:00
Luke Pulverenti
b4851d4789 separate deinterlacing params by video codec 2017-09-21 17:36:19 -04:00
Luke Pulverenti
cdd79ec7e2 update owned items 2017-09-18 12:52:22 -04:00
Luke Pulverenti
1f12ab6658 add yadif setting 2017-09-17 02:42:23 -04:00
Luke Pulverenti
c7656fb604 removed dead code 2017-09-17 01:27:15 -04:00
Luke Pulverenti
106575e443 3.2.30.21 2017-09-15 02:32:20 -04:00
Luke Pulverenti
38fe239f44 3.2.30.19 2017-09-13 14:41:48 -04:00
Luke Pulverenti
2f99a78230 3.2.30.17 2017-09-11 15:25:13 -04:00
Luke Pulverenti
f7f41e4c73 remove unused service properties 2017-09-10 17:32:45 -04:00
Luke Pulverenti
4ceb9eb6c5 update restart function 2017-09-09 14:51:24 -04:00
Luke Pulverenti
adc22b5e81 rework epg storage 2017-09-08 12:13:58 -04:00
Luke Pulverenti
eb63e0d264 update image processor 2017-09-07 14:17:18 -04:00
Luke Pulverenti
49b799adbe 3.2.30.8 2017-09-05 15:49:02 -04:00
Luke Pulverenti
39c4542cf6 update query objects 2017-09-04 15:28:22 -04:00
Luke Pulverenti
c4176d2320 add web socket error handling 2017-09-03 21:24:20 -04:00
Luke Pulverenti
2084678266 update service creation 2017-09-03 03:28:58 -04:00
Luke Pulverenti
78165d78a2 update SocketHttpListener 2017-09-02 22:42:13 -04:00
Luke Pulverenti
8de80d43ba update ResolutionNormalizer 2017-08-30 14:06:54 -04:00
Luke Pulverenti
780b761456 3.2.29.2 2017-08-28 12:41:32 -04:00
Luke Pulverenti
e287e3a50d remove async when there's nothing to await 2017-08-26 20:32:33 -04:00
Luke Pulverenti
6bc2a79792 fix folder rip probe 2017-08-26 03:03:19 -04:00
Luke Pulverenti
e441e2f53d update active recordings 2017-08-24 15:52:19 -04:00
Luke Pulverenti
82ab91f209 add property to indicate support for on the fly subtitle extraction 2017-08-23 15:45:40 -04:00
Luke Pulverenti
af02f9d692 add mpdecimate option 2017-08-23 14:44:40 -04:00
Luke Pulverenti
3c1fe6ff83 add experimental warning for folder rip transcoding 2017-08-22 01:41:02 -04:00
Luke Pulverenti
f4765a87cc update m3u tuner 2017-08-20 15:10:00 -04:00
Luke Pulverenti
1ad990ad72 update live tv data transfer 2017-08-19 15:43:35 -04:00
Luke Pulverenti
a7dcf7191a add fixes for .net core 2017-08-17 16:19:02 -04:00
Luke Pulverenti
56263a9fa2 remove unused libs 2017-08-16 11:42:36 -04:00
Luke Pulverenti
d2b86edf05 update hdhr channel ids 2017-08-15 23:40:36 -04:00
Luke Pulverenti
0951819f00 fixes #2798, fixes #2799 2017-08-13 16:15:07 -04:00
Luke Pulverenti
4ea3925626 auto fallback from gpu to cpu 2017-08-13 01:01:34 -04:00
Luke Pulverenti
6b28eee2db rework episode queries 2017-08-12 22:09:07 -04:00
Luke Pulverenti
cf350f3b7e expand on hardware decoding options 2017-08-12 15:09:13 -04:00
Luke Pulverenti
b7867214ef update download error handling 2017-08-11 17:55:48 -04:00
Luke Pulverenti
a7db7cd40c reduce traffic from session player 2017-08-11 02:29:49 -04:00
Luke Pulverenti
900714c866 consolidate fields 2017-08-10 16:06:36 -04:00
Luke Pulverenti
e7425e6205 revert servicestack.text update 2017-08-10 14:01:31 -04:00
Luke Pulverenti
c147b64de8 3.2.26.19 2017-08-09 17:08:01 -04:00
Luke Pulverenti
40442f887b consolidate emby.server.core into emby.server.implementations 2017-08-09 15:56:38 -04:00
Luke Pulverenti
994720c24a deprecate hddvd videotype 2017-08-07 16:36:41 -04:00
Luke Pulverenti
6d78824c8e update components 2017-08-06 19:01:00 -04:00
Luke Pulverenti
db315c4e32 update media source methods 2017-08-05 15:02:33 -04:00
Luke Pulverenti
d8e2887071 update container value 2017-08-04 16:29:34 -04:00
Luke Pulverenti
e208ef19b0 check audio stream for null 2017-08-04 10:49:46 -04:00
Luke Pulverenti
b786cca9da consolidate methods 2017-08-04 02:34:46 -04:00
Luke Pulverenti
0ba267f8e2 Enable hardware acceleration for image extraction 2017-08-02 03:30:17 -04:00
Luke Pulverenti
4e52c027bc improve nextup queries 2017-08-01 12:45:57 -04:00
Luke Pulverenti
31841a31a9 3.2.26.7 2017-07-30 14:02:25 -04:00
Luke Pulverenti
d270b10db6 move auto-organize to plugin 2017-07-27 01:18:39 -04:00
Luke Pulverenti
dc7a59c73a ensure custom css is loaded last 2017-07-23 18:29:53 -04:00
Luke Pulverenti
a0e7cdd2dc support all inclusive direct play profile 2017-07-14 11:57:44 -04:00
Luke Pulverenti
07ab6a19e2 3.2.24.1 2017-07-10 03:37:00 -04:00
Luke Pulverenti
6ea8e7868d add live stream params 2017-07-03 13:16:01 -04:00
Luke Pulverenti
15947c2a4c update opening of live streams 2017-07-02 14:58:56 -04:00
Luke Pulverenti
5cafb17e8f fix stream builder error 2017-07-01 14:00:43 -04:00
Luke Pulverenti
1f96841e04 add perfect match indicator to subtitle editor 2017-06-30 15:58:53 -04:00
Luke Pulverenti
dcaf8356e6 update inherited images 2017-06-29 15:10:58 -04:00
Luke Pulverenti
a759b09577 support max audio bit depth 2017-06-26 11:10:52 -04:00
Luke Pulverenti
f2fb52761f update stream building 2017-06-25 13:50:17 -04:00
Luke Pulverenti
a107ff0369 capture more transcoding info 2017-06-24 14:33:19 -04:00
Luke Pulverenti
6b2445aa2c add stream loop option for m3u 2017-06-24 14:32:22 -04:00
Luke Pulverenti
f57dfc6a61 specify tiff mime types 2017-06-24 14:31:13 -04:00
Luke Pulverenti
1e5c3db9eb support individual library refreshing 2017-06-23 12:04:45 -04:00
Luke Pulverenti
ce47f63389 3.2.20.5 2017-06-18 03:11:55 -04:00
Luke Pulverenti
ccb5b14d77 update series resolver 2017-06-15 13:22:05 -04:00
Luke Pulverenti
1663b258a7 update home sections 2017-06-13 02:33:29 -04:00
Luke Pulverenti
9f0e6d17c8 add hevc cuvid 2017-06-12 03:11:54 -04:00
Luke Pulverenti
ceed0241fd fixes #2578 - [VAAPI Bug] HEVC Decoding not possible on Intel hardware without this ability 2017-06-12 02:11:19 -04:00
Luke Pulverenti
65e8cf0726 improve live tv images 2017-06-11 16:40:25 -04:00
Luke Pulverenti
282dce7f10 normalize session object 2017-06-09 15:26:54 -04:00
Luke Pulverenti
5e57b829d3 update CodecProfile checks 2017-06-07 00:56:48 -04:00
Luke Pulverenti
8a780bc023 add interlaced fix 2017-06-06 02:13:27 -04:00