mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #4135] [CLOSED] Networking 4 : File movement. (Cumulative PR with 3a-3d) #9901
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/4135
Author: @BaronGreenback
Created: 9/13/2020
Status: ❌ Closed
Base:
master← Head:NetworkPR4📝 Commits (3)
a4a3960File movesb547facCommenting and file moves395a1daUpdate IDeviceDiscovery.cs📊 Changes
90 files changed (+2606 additions, -679 deletions)
View changed files
➖
Emby.Dlna/Common/Argument.cs(+0 -13)➖
Emby.Dlna/Common/DeviceIcon.cs(+0 -29)➖
Emby.Dlna/Common/DeviceService.cs(+0 -21)➖
Emby.Dlna/Common/ServiceAction.cs(+0 -24)➖
Emby.Dlna/Common/StateVariable.cs(+0 -27)📝
Emby.Dlna/Configuration/ConfigurationExtension.cs(+1 -3)📝
Emby.Dlna/Configuration/DlnaConfigurationFactory.cs(+1 -2)📝
Emby.Dlna/Configuration/DlnaOptions.cs(+56 -9)📝
Emby.Dlna/ConnectionManager/ConnectionManagerService.cs(+11 -3)📝
Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs(+80 -69)📝
Emby.Dlna/ConnectionManager/ControlHandler.cs(+13 -2)📝
Emby.Dlna/ConnectionManager/IConnectionManager.cs(+4 -1)📝
Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs(+33 -8)📝
Emby.Dlna/ContentDirectory/ContentDirectoryService.cs(+36 -6)📝
Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs(+121 -112)📝
Emby.Dlna/ContentDirectory/ControlHandler.cs(+453 -88)📝
Emby.Dlna/ContentDirectory/IContentDirectory.cs(+4 -1)📝
Emby.Dlna/ContentDirectory/ServerItem.cs(+13 -2)📝
Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs(+45 -8)📝
Emby.Dlna/ContentDirectory/StubType.cs(+3 -0)...and 70 more files
📄 Description
IGNORE the number of files changed
This change is basically a file move with the RSSDP files being moved into the Emby.DLNA folder, and moved some Emby DLNA files into their corresponding folders. (I did do git mv, but it looks like some git links haven't been kept).
Once the previous PRs have been accepted, the majority of these file changes will disappear.
Files to ignore
Anything outside of the \Emby.Dlna\ folder.
MediaBrowser.sln
DlnaEntryPoints.cs
DlnaManager.cs
Emby.Dlna.csproj
RSSDP/* - everything in this folder.
File changed in PR 3a - 3d.
Details:
moved RSSDP/SsdpDevice.cs to Emby.Dlna/PlayTo/DevicesSsdpDevice.cs
moved RSSDP/SsdpEmbeddedDevice.cs to Emby.Dlna/PlayTo/DevicesSsdpEmbeddedDevice.cs
moved RSSDP/SsdpRootDevice.cs to Emby.Dlna/PlayTo/DevicesSsdpRootDevice.cs
moved RSSDP/DeviceAvailableEventArgs.cs to Emby.Dlna/PlayTo/EventArgsDeviceEventArgs.cs
moved Emby.Dlna.Common/Argument.cs to Emby.Model.Dlna/Argument.cs
moved Emby.Dlna.Common/DeviceIcon.cs to Emby.Model.Dlna/DeviceIcon.cs
moved Emby.Dlna.Common/DeviceService.cs to Emby.Model.Dlna/DeviceService.cs
moved Emby.Dlna.Common/ServiceAction.cs to Emby.Model.Dlna/ServiceAction.cs
moved Emby.Dlna.Common/StateVariable.cs to Emby.Model.Dlna/StateVariable.cs
moved Emby.Dlna/DlnaConfigurationFactory.cs to Emby.Dlna.Configuration/DlnaConfigurationFactory.cs
moved Emby.Dlna/ConfigurationExtension.cs to Emby.Dlna.Configuration/ConfigurationExtension.cs
moved Emby.Dlna/IConnectionManager.cs to Emby.Dlna/ConnectionManager/IConnectionManager.cs
moved Emby.Dlna/IContentDirectory.cs to Emby.Dlna/ContentDirectory/IContentDirectory.cs
moved Emby.Dlna/IMediaReceiverRegistrar.cs to Emby.Dlna/IMediaReceiverRegistrar.cs
moved Emby.Dlna/IDlnaEventManager.cs to Emby.Dlna/MediaReceiverRegistrar/IDlnaEventManager.cs
moved Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs to Emby.Dlna/PlayTo/PlaybackEventArgs.cs
moved Emby.Dlna/PlayTo/Device to Emby.Dlna/PlayTo/PlayToDevice.cs
moved Emby.Dlna/Ssdp/SsdpExtensions.cs to Emby.Dlna/PlayTo/XElementExtensions.cs
moved Emby.Dlna/ControlRequest.cs to Emby.Dlna/Service/ControlRequest.cs
moved Emby.Dlna/ControlResponse.cs to Emby.Dlna/Service/ControlResponse.cs
moved Emby.Dlna/IUpnpService.cs to Emby.Dlna/Service/IUpnpService.cs
moved Emby.Dlna/EventSubscriptionResponse.cs to Emby.Dlna/Eventing/EventSubscriptionResponse.cs
moved Emby.Dlna.Common/Arguments.cs to Emby.Model.Dlna/Arguments.cs
moved Emby.Dlna.Common/DeviceIcons.cs to Emby.Model.Dlna/DeviceIcons.cs
moved Emby.Dlna.Common/DeviceService.cs to Emby.Model.Dlna/DeviceService.cs
moved Emby.Dlna.Common/ServiceAction.cs to Emby.Model.Dlna/ServiceAction.cs
moved Emby.Dlna.Common/StateVariable.cs to Emby.Model.Dlna/StateVariable.cs
The RSSDP folder has been moved into the Emby.DLNA folder
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.