Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-05 21:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
24005 commits 29 branches 75 tags 1.3 GiB
Commit graph

622 commits

Author SHA1 Message Date
BaronGreenback d95ca20fc7 removed bad merge code 2021-02-27 14:05:13 +00:00
BaronGreenback a25e3c0256 fix for override ports contained in PublishedServerUrl 2021-02-27 13:56:21 +00:00
Joshua M. Boniface 7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Bond-009 0beda0e32c
Merge pull request #5275 from BaronGreenback/upnpStartupFix 
Fixes #5148
 2021-02-21 19:59:15 +01:00
BaronGreenback c50d0dbc72 Fixed startup racing issue 2021-02-20 23:06:48 +00:00
Bond_009 40b9e7592f Fix build 2021-02-20 23:34:15 +01:00
Bond_009 141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
dkanada 13d65318eb
Merge pull request #5223 from Bond-009/minor10 
Minor improvements
 2021-02-20 10:56:55 +09:00
Bond_009 e9f22303a4 Properly forward cancellationTokens 2021-02-15 14:19:17 +01:00
Bond_009 65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
Troy 8c640a1492 Replaced /d with [0-9], see issue #2923 2021-02-01 02:49:23 +00:00
Claus Vium b9691e8712
Merge pull request #5025 from BaronGreenback/DlnaFix 2021-01-18 14:24:35 +01:00
BaronGreenback e81b7c8f4f reverted 2021-01-18 12:17:18 +00:00
BaronGreenback 828a9b7c75 rollback 2021-01-17 23:30:56 +00:00
BaronGreenback 13012bfa27 Fix bug in GetItemId 2021-01-17 22:43:05 +00:00
BaronGreenback 620648fe81 Fixed for no data. 2021-01-15 18:55:52 +00:00
BaronGreenback 16d092a8a7 Fixed encoding issue 2021-01-15 12:17:50 +00:00
Bond-009 a554423163
Merge pull request #4976 from BaronGreenback/dlnaPortFix 
Fixed DLNA Server on RC2
 2021-01-08 21:06:14 +01:00
BaronGreenback 192efff791
Update DlnaEntryPoint.cs 2021-01-07 17:17:22 +00:00
Bill Thornton cfca27e99a Fix capitalization of Playstate message 2021-01-05 10:06:55 -05:00
Joshua M. Boniface ccc1b8bf92
Merge pull request #4729 from BaronGreenback/19.0RC---Fix-networkInterfaceFix 2020-12-30 19:57:53 -05:00
BaronGreenback 4c291da45c
Encoding fix for System Logs. (#4564) 2020-12-30 18:31:26 +01:00
Bond-009 054adf6379
Merge pull request #4853 from Ullmie02/servicestack-json 2020-12-30 10:33:32 +01:00
David 043d045448 Put json serializer options in private field 2020-12-24 11:22:34 +01:00
David bc0976ceac Remove custom Json serializer from Dlna 2020-12-23 13:14:40 +01:00
Bond-009 3a452463fc
Merge pull request #4849 from crobibero/clean-deps 
Remove unused dependencies
 2020-12-23 11:51:41 +01:00
crobibero 1dac2226c4 Remove unused deps 2020-12-22 08:57:51 -07:00
BaronGreenback f06d52c475 Disable API if dlna is disabled. 2020-12-18 23:29:21 +00:00
nyanmisaka 7c3f2e7c59 Correct DLNA audio codecs for PS3 and PS4 
* https://manuals.playstation.net/document/en/ps3/current/video/filetypes.html
* https://manuals.playstation.net/document/en/ps4/music/mp_format_m.html
 2020-12-16 21:20:29 +08:00
Greenback d69f2d7d7f DNLA over HTTP only 2020-12-07 22:06:28 +00:00
Greenback 8999871b68 cleaned change 2020-12-07 18:31:45 +00:00
Greenback d14d8145d5 Fixed createPlayList 2020-12-07 18:27:22 +00:00
Bond_009 e530401462
Remove spammy debug line 2020-12-04 22:15:00 +01:00
Bond_009 e4fd61411f Minor improvements 2020-12-02 15:38:52 +01:00
Bond_009 f6a38e6340 Add tests for GetUuid 2020-12-01 15:12:55 +01:00
BaronGreenback a8ceb7e20b
Update DlnaEventManager.cs 2020-11-28 23:45:26 +00:00
BaronGreenback 4a67267e1e
Update DlnaEventManager.cs 
Set notificationType
 2020-11-28 23:44:19 +00:00
Greenback 5224200e8c Fixed baseurl in dlna. 2020-11-21 19:50:40 +00:00
BaronGreenback 7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
Greenback a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Joshua M. Boniface 212c5318ae
Merge pull request #4507 from BaronGreenback/Spelling 
Corrects spelling in comments
 2020-11-19 13:08:28 -05:00
Joshua M. Boniface 75d4a573a3
Merge pull request #4137 from BaronGreenback/Comment2 
DLNA ConnectionManager - static and commented.
 2020-11-19 13:03:37 -05:00
BaronGreenback 7a26f64c7b
Update Device.cs 2020-11-18 13:48:31 +00:00
Greenback e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Bond_009 4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
Joshua M. Boniface e0f60847c0
Merge pull request #4361 from ssenart/feature/4360-transcoding_flac_downsampling 
Add FLAC and define the corresponding target sample rate
 2020-11-17 10:29:29 -05:00
Joshua M. Boniface e86db484ef
Merge pull request #4136 from BaronGreenback/Comment1 
DLNA Classes - No code change, just added commenting to classes.
 2020-11-16 17:11:20 -05:00
Joshua M. Boniface 355c0c802f
Merge pull request #4138 from BaronGreenback/Comment3 
DLNA ContentManager - static and commented.
 2020-11-16 17:09:22 -05:00
Greenback 979de240cb Updated tests to .Net5 2020-11-16 17:30:27 +00:00
BaronGreenback d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
crobibero dae4541bad Merge remote-tracking branch 'upstream/master' into dotnet-5 2020-11-15 11:56:35 -07:00
Bond_009 c4bb32f259
Access last element by index where possible 2020-11-14 20:28:14 +01:00
Bond_009 bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
BaronGreenback 27bb17ef9d
Merge branch 'master' into Comment1 2020-11-12 09:18:49 +00:00
crobibero 83629ab6f2 Update packages to net5 2020-11-10 09:52:34 -07:00
Claus Vium 4bccff26f2
Merge pull request #4434 from BaronGreenback/4423 
Fixes #4423 - Fixes DLNA in unstable;
 2020-11-07 22:13:26 +01:00
BaronGreenback c6ff56a230
Update BaseControlHandler.cs 2020-11-07 18:59:32 +00:00
Bond_009 b21919c7f4 Minor perf improvements 2020-11-06 16:15:30 +01:00
BaronGreenback ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
Anthony Lavado 6205fb4b6a
Merge pull request #4341 from Bond-009/minor6 
Minor improvements
 2020-11-02 11:10:39 -05:00
Greenback 83af636c61 Updated with new NetManager 2020-10-31 18:21:46 +00:00
Greenback ec57eeff2b Updated to latest version of code. 2020-10-30 14:06:11 +00:00
BaronGreenback 0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
Stéphane Senart 5979151f11 [AudioTranscoding] Add FLAC as supported target audio format and be able to define the corresponding target sample rate 2020-10-22 12:22:31 +02:00
Bond_009 5a9c218324 Fix build 2020-10-17 16:27:31 +02:00
Bond_009 49569ca0a0 Use nameof where possible 2020-10-17 16:19:57 +02:00
BaronGreenback 63be65dd91
Merge branch 'master' into Comment1 2020-10-17 15:00:43 +01:00
BaronGreenback 0f47b3ec2d
Merge branch 'master' into Comment4 2020-10-11 21:30:57 +01:00
dkanada d9e7f1f75f
Merge pull request #4212 from BaronGreenback/BaseControlHandlerFix 
Null Pointer fix: BaseControlHandler.cs
 2020-10-10 15:52:48 +09:00
Greenback ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Bond-009 e011659186
Merge pull request #4210 from nielsvanvelzen/typed-websocket-message 
Use enum for WebSocket message types
 2020-10-05 10:40:52 +02:00
Jim Cartlidge 53af1e3455 Updatig netcollection & re-inserting BOM 2020-10-04 09:56:33 +01:00
github@esslinger.dev dd4f3a7c51 feat: convert supportedCommands strings to enums 2020-10-01 18:43:44 +02:00
Jim Cartlidge fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
dkanada 206c382b92
Merge pull request #4211 from BaronGreenback/NullPointerFix 
Null Pointer Fix : PlayToController.cs
 2020-09-28 23:51:24 +09:00
BaronGreenback ef737a4e8e
Update Emby.Dlna/Configuration/DlnaOptions.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-28 07:49:36 +01:00
BaronGreenback bdfe7554e9
Update Emby.Dlna/Configuration/DlnaOptions.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-28 07:49:08 +01:00
Bond-009 43add833cc
Merge pull request #4162 from BaronGreenback/DlnaServerBaseUrlFix 
Fix for #4161: BaseUrl in DLNA
 2020-09-27 20:01:32 +02:00
Niels van Velzen 72534f9d66 Use SessionMessageType for WebSocket messages 2020-09-27 10:00:20 +02:00
BaronGreenback 7567779127
Update BaseControlHandler.cs 2020-09-25 19:51:37 +01:00
BaronGreenback 63571578ae
Update BaseControlHandler.cs 2020-09-25 19:44:16 +01:00
BaronGreenback a52ab69e13
Update DescriptionXmlBuilder.cs 2020-09-25 18:47:24 +01:00
BaronGreenback f3a90bab47
Update DescriptionXmlBuilder.cs 2020-09-25 18:46:52 +01:00
BaronGreenback 12b5f1127e
Update DescriptionXmlBuilder.cs 2020-09-25 18:46:20 +01:00
BaronGreenback 293237b714
Update BaseControlHandler.cs 2020-09-25 18:40:10 +01:00
BaronGreenback a9864368c4
Update PlayToController.cs 2020-09-25 17:25:50 +01:00
Jim Cartlidge 8c85cfd01d Fixed build 2020-09-24 16:02:29 +01:00
BaronGreenback 28634d3b36
Update DlnaEntryPoint.cs 2020-09-24 15:43:06 +01:00
Jim Cartlidge 5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado 5aa743a6a2
Merge pull request #4163 from Bond-009/minor4 
Minor improvements
 2020-09-23 10:30:13 -04:00
Anthony Lavado af24c43118
Merge pull request #4192 from nielsvanvelzen/generalcommand-sucks 
Use GeneralCommandType enum in GeneralCommand
 2020-09-23 09:57:45 -04:00
Andrew Rabert 5a74710df3 Optimize images 
Used:
- `oxipng --zopfli --opt max --strip all`
- `jpegoptim --all-progressive --strip-all`
 2020-09-21 17:01:50 -04:00
Niels van Velzen 3459655bb4 Use GeneralCommandType enum in GeneralCommand name 2020-09-21 16:56:22 +02:00
Bond_009 2dbf73b989 Minor improvements 2020-09-16 14:16:44 +02:00
BaronGreenback d99db543da
Update DescriptionXmlBuilder.cs 2020-09-16 12:08:37 +01:00
BaronGreenback a6400d12c9
Update DescriptionXmlBuilder.cs 2020-09-16 12:08:23 +01:00
BaronGreenback c2e2e5ac0c
Update DescriptionXmlBuilder.cs 2020-09-16 12:03:17 +01:00
BaronGreenback 86ad04b657
Update DescriptionXmlBuilder.cs 2020-09-16 12:02:00 +01:00
Jim Cartlidge 38b8110a3e Removing blank lines. 2020-09-14 15:55:25 +01:00
Jim Cartlidge b44455ad0d Update based on PR1 changes. 2020-09-14 15:46:38 +01:00
Jim Cartlidge c41ed13b3d Commenting. 2020-09-13 14:36:10 +01:00
Jim Cartlidge c1b3f2c136 ContentDirectory 2020-09-13 14:31:12 +01:00
Jim Cartlidge 3ad320175d ConnectionManager - static implementation 2020-09-13 14:18:15 +01:00
Jim Cartlidge 68de105dc2 Comments part 1 2020-09-13 13:49:11 +01:00
Jim Cartlidge 9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
Bond-009 18fe328979
Merge pull request #4084 from BaronGreenback/PlayTo-url-corruption-fix 
Unstable: PlayTo corruption url fix
 2020-09-10 15:35:06 +00:00
BaronGreenback c84aabe954
Update PlayToManager.cs 
Fixed name violation
 2020-09-08 09:27:44 +01:00
BaronGreenback fde5afc36b
Update PlayToManager.cs 
removed tab
 2020-09-08 09:26:52 +01:00
BaronGreenback 544db8cc06
Update PlayToManager.cs 
made code more readable.
 2020-09-08 07:53:53 +01:00
Anthony Lavado 3aee338066
Merge pull request #4073 from Bond-009/useafterdispose 
Fix ObjectDisposedException
 2020-09-07 19:39:42 -04:00
BaronGreenback ed9021f40b
Update PlayToManager.cs 2020-09-07 21:43:48 +01:00
Bond-009 c750632cfc
Merge pull request #4065 from BaronGreenback/dlna_serverfix 
Bug Fix : DLNA Server advertising
 2020-09-07 12:36:03 +00:00
BaronGreenback a2687fac5e
Merge branch 'master' into simplified_dlnamanager 2020-09-07 12:29:31 +01:00
BaronGreenback 03d8f6f43b
Update DlnaManager.cs 
removed space.
 2020-09-07 12:27:55 +01:00
BaronGreenback b673f5bcde
Update DlnaManager.cs 2020-09-07 12:27:26 +01:00
BaronGreenback eedb520af1 Removed code that wasn't used. 2020-09-07 12:14:02 +01:00
BaronGreenback 6a5df73151
Update DlnaManager.cs 
Changed function name to IsRegexOrSubstringMatch
 2020-09-07 12:09:15 +01:00
BaronGreenback 12d0f29dea
Update Emby.Dlna/DlnaManager.cs 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2020-09-07 12:07:57 +01:00
Bond_009 343fc8c668 Fix ObjectDisposedException 
```
System.Net.Http.HttpRequestException: An error occurred while sending the request.
 ---> System.ObjectDisposedException: Cannot access a disposed object.
Object name: 'System.Net.Http.StringContent'.
   at System.Net.Http.HttpContent.CheckDisposed()
   at System.Net.Http.HttpContent.CopyToAsync(Stream stream, TransportContext context, CancellationToken cancellationToken)
   at System.Net.Http.HttpConnection.SendRequestContentAsync(HttpRequestMessage request, HttpContentWriteStream stream, CancellationToken cancellationToken)
   at System.Net.Http.HttpConnection.SendAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
   --- End of inner exception stack trace ---
   at System.Net.Http.HttpConnection.SendAsyncCore(HttpRequestMessage request, CancellationToken cancellationToken)
   at System.Net.Http.HttpConnectionPool.SendWithNtConnectionAuthAsync(HttpConnection connection, HttpRequestMessage request, Boolean doRequestAuth, CancellationToken cancellationToken)
   at System.Net.Http.HttpConnectionPool.SendWithRetryAsync(HttpRequestMessage request, Boolean doRequestAuth, CancellationToken cancellationToken)
   at System.Net.Http.RedirectHandler.SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
   at System.Net.Http.DecompressionHandler.SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
   at Microsoft.Extensions.Http.Logging.LoggingHttpMessageHandler.SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
   at Microsoft.Extensions.Http.Logging.LoggingScopeHttpMessageHandler.SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
   at System.Net.Http.HttpClient.FinishSendAsyncUnbuffered(Task`1 sendTask, HttpRequestMessage request, CancellationTokenSource cts, Boolean disposeCts)
   at Emby.Dlna.PlayTo.SsdpHttpClient.SendCommandAsync(String baseUrl, DeviceService service, String command, String postData, String header, CancellationToken cancellationToken) in /home/loma/dev/jellyfin/Emby.Dlna/PlayTo/SsdpHttpClient.cs:line 41
   at Emby.Dlna.PlayTo.Device.GetTransportInfo(TransportCommands avCommands, CancellationToken cancellationToken) in /home/loma/dev/jellyfin/Emby.Dlna/PlayTo/Device.cs:line 629
   at Emby.Dlna.PlayTo.Device.TimerCallback(Object sender) in /home/loma/dev/jellyfin/Emby.Dlna/PlayTo/Device.cs:line 445
```
 2020-09-07 12:22:33 +02:00
BaronGreenback babdd30a46
Renamed IsRegExMatch to IsPropertyMatch 2020-09-05 21:49:30 +01:00
BaronGreenback ebad504f3b
Fixed profile 2020-09-05 21:25:47 +01:00
BaronGreenback e3fdea2ec9
Update DlnaManager.cs 
Fix for #4060
 2020-09-05 19:48:37 +01:00
crobibero 2a8653b309 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-04 08:16:49 -06:00
crobibero d8a0edc511 Revert "Remove ResponseHeadersRead where applicable" 
This reverts commit 85844a84b6.
 2020-09-03 07:20:33 -06:00
crobibero 85844a84b6 Remove ResponseHeadersRead where applicable 2020-09-03 06:48:19 -06:00
crobibero b398c35068 use UserAgent.ParseAdd where possible 2020-09-01 13:16:19 -06:00
crobibero 4038d15c83 Properly migrate all HttpCompletionOption 2020-09-01 07:51:06 -06:00
Bond_009 e653eef44f Fix some warnings 2020-08-31 22:20:19 +02:00
crobibero c02d0ceb57 Add missing using 2020-08-31 12:45:23 -06:00
crobibero 8215f15c45 migrate to IHttpClientFactory in Emby.Dlna 2020-08-31 11:26:42 -06:00
Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1 
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
 2020-08-24 20:04:13 -04:00
Bond_009 170e434f92 Fix all warnings in Emby.Dlna 2020-08-20 21:04:57 +02:00
Bond-009 6292a9e4e9
Merge branch 'master' into warn24 2020-08-20 18:50:15 +02:00
David 1337a0dcec Code review 2020-08-20 17:59:27 +02:00
David ca2b36bdb0 Reduce warnings in Emby.Dlna 2020-08-20 17:08:33 +02:00
Bond_009 6123e2e848 Fix build 2020-08-20 12:24:34 +02:00
Bond_009 ab2147751f Make MediaBrowser.MediaEncoding warnings free 2020-08-20 12:16:24 +02:00
Patrick Barron 98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Bond_009 2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
crobibero 09c8597461 inheritdoc 2020-08-16 08:40:43 -06:00
crobibero 7d2ad3e0fc Fix DlnaControlResponse string return 2020-08-16 08:32:03 -06:00
Patrick Barron ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Patrick Barron da9bcc5fb3 Rename IEventManager to IDlnaEventManager 2020-08-13 15:47:31 -04:00
crobibero f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Patrick Barron 3a0bccb941
Merge pull request #2957 from crobibero/api-dlna-server 
Migrate DlnaServerController to Jellyfin.Api
 2020-08-03 17:00:46 +00:00
Bond-009 b7421db5fe
Merge pull request #3578 from barronpm/displaypreferences-efcore 
Migrate Display Preferences to EF Core
 2020-08-01 21:51:49 +02:00
crobibero 3d5f89ebf9 Merge remote-tracking branch 'upstream/api-migration' into api-dlna-server 2020-07-31 10:17:51 -06:00
crobibero f516cf9c4c Merge remote-tracking branch 'upstream/api-migration' into api-dlna 2020-07-31 10:05:27 -06:00
Bond_009 d4092846e4 Optimize Substring and StringBuilder usage 2020-07-29 13:17:01 +02:00
Bond-009 3ff110984a
Merge branch 'master' into readonlyspan 2020-07-24 09:40:44 +02:00
Patrick Barron 3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Joshua M. Boniface 8960d6256f
Merge pull request #3659 from Bond-009/stringbuilder 
Optimize StringBuilder.Append calls
 2020-07-23 18:08:09 -04:00
Joshua M. Boniface fd82ecd18e
Merge pull request #3595 from Bond-009/xml 
Improve DescriptionXmlBuilder
 2020-07-23 18:06:15 -04:00
Bond-009 89ff865d40
Merge pull request #3508 from BaronGreenback/nullable 
Part 1: nullable Emby.DLNA
 2020-07-22 18:41:58 +02:00
Bond_009 4d681e3cad Optimize StringBuilder.Append calls 2020-07-22 14:34:51 +02:00
Bond_009 febb6bced6 Review usage of string.Substring (part 1) 
Reduced allocations by replacing string.Substring with ReadOnlySpan<char>.Slice
 2020-07-22 13:39:24 +02:00
Bond_009 65453c0a84 Fix build and more Append calls 2020-07-19 21:32:54 +02:00
Bond_009 39be99504f Improve DescriptionXmlBuilder 
* Replace XML escape code with SecurityElement.Escape
* Optimize StringBuilder.Append calls
 2020-07-19 21:20:18 +02:00
BaronGreenback 672a35db94
Update DlnaServerService.cs 2020-07-19 17:54:09 +01:00
BaronGreenback f9b0816b80 Changes a suggested. 2020-07-18 16:54:23 +01:00
Patrick Barron ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
BaronGreenback 0f696104ac using missing. 2020-07-17 16:23:47 +01:00
BaronGreenback c7c28db17b
Update DlnaServerService.cs 2020-07-17 16:08:26 +01:00
BaronGreenback d9f9412955
Update DlnaServerService.cs 2020-07-17 12:58:23 +01:00
Patrick Barron 6d1b00da64 Use Array.Empty 2020-07-04 11:54:25 -04:00
Cody Robibero 43221fc26b
Merge branch 'master' into SSDP 2020-06-20 15:33:13 -06:00
telans 7f307f9082
brace multiline if statements 2020-06-20 21:12:36 +12:00
telans 98db8f72e0
fix SA1503 for one line if statements 2020-06-20 20:35:29 +12:00
telans 8e3d874802
remove regions 2020-06-20 18:20:33 +12:00
dkanada 215ab39e00
Merge pull request #3342 from BaronGreenback/BugFix2 
Fix for [DLNA] Many log messages from Media Renderers trying to see old events
 2020-06-16 19:02:16 +09:00
Bond-009 9af6eda0b4
Merge pull request #3343 from telans/comment-stops 
Add full stop at end of comments (SA1629)
 2020-06-16 11:54:58 +02:00
telans 247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans 9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
BaronGreenback 6d6793151a Null pointer check added for subscription as 2nd param is false. 2020-06-15 10:10:52 +01:00
telans 3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans acd4389653
fix SA1005 2020-06-15 10:41:00 +12:00
telans 726e116d5b
fix SA1510 2020-06-15 10:40:57 +12:00
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
 2020-06-13 19:41:05 -04:00
BaronGreenback 4d9171f691
Update DlnaEntryPoint.cs 
Left a _config behind.
 2020-06-11 22:40:43 +01:00
BaronGreenback 5cf44e7736 Removed spaces 2020-06-09 22:11:23 +01:00
BaronGreenback 93568be3e7 Updates 2020-06-09 22:05:22 +01:00
crobibero 57d1dbfe7b undo erroneous changes 2020-06-05 18:29:58 -06:00
crobibero 44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
 2020-06-04 16:52:23 -04:00
Vasily 668e10ceb7
Merge pull request #2767 from Bond-009/nullable3 
Enable nullabe reference types for MediaBrowser.Model
 2020-06-03 12:26:54 +03:00
Bond_009 7439e095e2 Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00
Bond_009 10e381f66f Fix some 'bugs' flagged by sonarcloud 2020-05-25 23:52:51 +02:00
Patrick Barron c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
 2020-05-15 17:20:07 -04:00
Patrick Barron 9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Bond_009 15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
BaronGreenback 8a69300bf5 Changes styles as suggested by @barronpm 
Added addtional comments & source type as per intellisense suggestion
change code as per sonacloud
 2020-04-29 12:24:01 +01:00
BaronGreenback ebd589aa86 Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored. 
Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
 2020-04-28 21:57:39 +01:00
BaronGreenback a3140f83c6 Revert "Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored." 
This reverts commit 2aaecb8e14.
 2020-04-28 21:51:49 +01:00
BaronGreenback 2aaecb8e14 Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored. 
Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
 2020-04-28 21:45:46 +01:00
Joshua M. Boniface 4fa6d1ccee
Merge pull request #2940 from balu92/master 
Fix missing colons
 2020-04-26 15:22:38 -04:00
Joshua M. Boniface ca4b6836c1
Merge pull request #2906 from randrey/dlna-nullref-fix 
Fix InvalidOperationException while browsing via DLNA client.
 2020-04-26 15:02:34 -04:00
Bond_009 118f30059c Merge branch 'master' into nullable4 2020-04-23 11:29:19 +02:00
crobibero 461b298be7 Migrate DlnaServerController to Jellyfin.Api 2020-04-21 19:15:27 -06:00
crobibero f5385e4735 Move Emby.Dlna DlnaService.cs to Jellyfin.Api 2020-04-21 18:12:46 -06:00