Commit Graph

362 Commits

Author SHA1 Message Date
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
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure
Remove requirement to build web during server builds
2020-04-22 00:17:44 +02:00
Mark Monteiro
c5f163293f Add <ProjectGuid> properties to all project files
This is required for SonarCloud analysis to run
2020-04-21 16:21:09 -04:00
Unknown
80f5dd1e59 Fixed missing colons
some colons were missing from the default ProtocolInfo string
2020-04-20 13:52:50 +01:00
randrey
0bef4eef87 Fix InvalidOperationException while browsing via DLNA client. 2020-04-17 14:45:56 -07:00
a1
eba781eac5 Fix DLNA clients displaying wrong album art. 2020-04-16 23:36:43 -07:00
Bond_009
2fcbc2a5b8 Enable nullabe reference types for Emby.Drawing and Jellyfin.Drawing.Skia 2020-04-05 21:19:04 +02:00
Bond_009
30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Vasily
d5cc10d7e1
Merge pull request #2741 from Bond-009/dlnawarnings2
Fix some warnings
2020-04-04 01:38:09 +03:00
Bond-009
64692af1a2
Update Device.cs 2020-04-04 00:24:36 +02:00
Bond-009
91b17e7289
Update Device.cs 2020-04-04 00:21:26 +02:00
Bond-009
4cacfd5997
Update DidlBuilder.cs 2020-04-03 23:20:04 +02:00
Bond-009
ad0e2e42e6
Update Device.cs 2020-04-03 23:13:45 +02:00
Bond_009
3161e85f76 Address comments 2020-04-03 17:30:01 +02:00
Bond-009
f6c9a44703
Update Device.cs 2020-04-03 16:46:14 +02:00
Bond-009
231c1e519f
Update Emby.Dlna.csproj 2020-04-03 16:44:40 +02:00
Vasily
a37b69a493
Merge pull request #2559 from whooo/295-fix
Add descriptive TV episode titles for DLNA browsing
2020-04-03 17:39:33 +03:00
Bond_009
8a566dfe73 Fix build 2020-04-02 17:07:37 +02:00
Bond_009
be8ba96183 Fix some warnings 2020-04-02 16:52:11 +02:00
Bond-009
62a18af17a
Update Emby.Dlna/Main/DlnaEntryPoint.cs
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-04-01 18:50:19 +02:00
Erik Larsson
b63ed35238 Add descriptive TV episode titles for DLNA browsing
When browsing TV episodes in Next Up, etc via DLNA a more descriptive
title should be used to easier identify the right episode.
2020-03-27 06:34:22 +01:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Mark Monteiro
b67e9cde8c Replace ILogger with ILogger<T> wherever possible
Log entries will contain additional class context when using this interface
2020-03-03 23:07:10 +01:00
Bond_009
07cc4be6a7 Fix some warnings
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
2020-02-23 12:11:43 +01:00
Claus Vium
241e351a61
Merge branch 'master' into dlnawarnings 2020-02-03 13:51:34 +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
d69870680b Close xmlwriter first 2020-01-29 17:30:27 +01:00
Bond_009
6ee04855cd Style 2020-01-28 21:54:51 +01:00
Bond-009
ae9c1e29e7 My bad 2020-01-28 17:50:25 +01:00
Bond-009
36d62c3093 Fix? 2020-01-28 13:19:25 +01:00
Bond_009
6b68521bae Try again 2020-01-27 23:34:40 +01:00
Bond_009
fc578de3b3 Try possible solutions 2020-01-27 22:43:58 +01:00
Bond-009
bade35958a Fix 2020-01-26 17:41:34 +01:00
Bond-009
3a338c1899 Address comments 2020-01-26 17:37:47 +01:00
Bond-009
c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Bond_009
82112b6788 Improvements to dlna server
* Improve response writer
* Add analyzers
* Error on warnings in release mode
* Disable doc warnings
2020-01-22 21:00:07 +01:00
dkanada
1dd4abebbd
Merge pull request #2297 from Bond-009/asyncio
Kestrel doesn't like sync IO operations
2020-01-23 01:59:52 +09:00
Bond-009
5340eb9363
Update Emby.Dlna/Service/BaseControlHandler.cs
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-01-22 17:46:26 +01:00
Bond-009
ac3b958c67 Use async methods 2020-01-21 17:59:41 +01:00
Carey Metcalfe
f2eea89ff0 Fix pagination for DLNA root folder list
Previously, when responding to a DLNA "Browse" request, the
`StartingIndex` was not respected and all of the root items were
returned each time. This caused infinite loops with in DLNA clients that
ignored the `TotalMatches` data in the response and just continued
asking for the next page until they got an empty response.

This fix makes the root folder list respect the `StartingIndex` and
`RequestedCount` parameters like all other responses.

Fixes issue #2303
2020-01-19 01:37:52 -05:00
Bond_009
2610f377c0 Kestrel doesn't like sync IO operations 2020-01-18 00:09:25 +01:00
Bond_009
976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond-009
fdbb329118 Remove StringHelper functions 2020-01-09 17:07:13 +01:00
Bond-009
49330e3082 Fix a couple of TODOs 2019-12-30 16:03:20 +01:00
dkanada
dee3076eaf
Merge pull request #1923 from Bond-009/random
Don't shuffle some types by default
2019-12-10 22:28:44 +09:00
Bond-009
a2c35e6dba Merge remote-tracking branch 'upstream/master' into random 2019-12-06 12:06:13 +01:00
Bond-009
94edb5b9f9
Add else 2019-12-06 11:58:45 +01:00
Bond-009
a6f883345f Reduce #lines 2019-12-05 17:44:46 +01:00
Bond_009
3221e837f9 * Add support for multi segment base urls
* Make baseurl case-insensitive
2019-11-25 11:55:24 +01:00
Bond-009
69d76af054
dlna GetPathValue
Forgot to update this last time, just copied the code from `MediaBrowser.Api/BaseApiService.cs`
2019-11-25 10:56:23 +01:00
Bond_009
5ee070eb29 Remove leading / from baseurl 2019-11-17 19:53:12 +01:00
Bond-009
d161b9cbfc Fix GetPathValue function for DLNA service 2019-11-13 16:40:34 +01:00
dkanada
0b02c77691
Merge pull request #1864 from Bond-009/installationmanager
Improve IInstallationManager interface
2019-11-13 21:12:52 +09:00
Bond-009
983d38a43b Merge branch 'master' into installationmanager 2019-11-07 10:50:55 +01:00
Bond_009
b0a25c4237 Use Mono.Nat Nuget package 2019-11-01 21:22:35 +01:00
Bond_009
d529f81cd9 Improve IInstallationManager interface 2019-11-01 17:57:19 +01:00
Bond_009
a245f5a0d4 Rewrite hex encoder/decoder 2019-11-01 17:52:29 +01:00
Bond_009
bbc0875387 Don't shuffle some types by default 2019-10-20 16:08:40 +02:00