diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-08-19 01:45:02 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-08-19 01:45:02 +0300 |
| commit | 4e216a0ca8ad3608b845fa445b73034e1a67b8af (patch) | |
| tree | 67e0ea698cfe5a8320aa81d8c13579e8ae6a6860 /Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem | |
| parent | f4c418cced4c6fb25ec5d4cb2bcb4ce0f766efd0 (diff) | |
| download | Tango-4e216a0ca8ad3608b845fa445b73034e1a67b8af.tar.gz Tango-4e216a0ca8ad3608b845fa445b73034e1a67b8af.zip | |
DB: Changed TechMonitors HeadZone5_6HeaterCurrent => HeadZone56HeaterCurrent
Working on insights and insights annotations.
Added insights events.
Added insights settings to PPC advanced settings.
Added compression support for transport adapters.
Implemented compression support on TCP/SignalR/WebRTC.
Added Compression flag to ExternalBridge discovery packet.
Added compression setting to PPC advanced settings.
Refactored transport layer to use Bson instead of Json for Generic Messages.
Added all SciChart referenced assemblies.
Registered EF Extensions license for FSE.
Added support for FSE PushTask notification cancel button.
Diffstat (limited to 'Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem')
| -rw-r--r-- | Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs index 6673a5ae3..e7f9772ff 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs @@ -167,7 +167,10 @@ namespace Tango.FSE.UI.FileSystem Priority = QueuePriority.Low }); - _webRtcTransporter = new BasicTransporter(new WebRtcTransportAdapter(_machineProvider.MachineOperator, WebRtcTransportAdapterMode.Active, WEB_RTC_CHANNEL_NAME)); + _webRtcTransporter = new BasicTransporter(new WebRtcTransportAdapter(_machineProvider.MachineOperator, WebRtcTransportAdapterMode.Active, WEB_RTC_CHANNEL_NAME) + { + EnableCompression = _machineProvider.MachineOperator.CompressionEnabled, + }); _webRtcTransporter.UseKeepAlive = false; _webRtcTransporter.ComponentName = "File System Active WebRTC Transporter"; await _webRtcTransporter.Connect(); @@ -272,11 +275,12 @@ namespace Tango.FSE.UI.FileSystem /// <summary> /// Downloads the specified file or folder item. /// </summary> - /// <param name="item">The file or folder.</param> + /// <param name="remotePath">The remote file or folder.</param> + /// <param name="isRemotePathFile">Indicates whether the remote path is a file.</param> /// <param name="localTargetFolderOrFile">The local target folder or file.</param> - /// <param name="isSingleFile">Indicates whether the localTargetFolder is a file.</param> + /// <param name="isLocalTargetFile">Indicates whether the localTargetFolder is a file.</param> /// <returns></returns> - public Task<FileSystemHandler> Download(FileSystemItem item, String localTargetFolderOrFile, bool isSingleFile = false) + public Task<FileSystemHandler> Download(FileSystemItem item, String localTargetFolderOrFile, bool isLocalTargetFile = false) { AuthenticationProvider.ThrowIfNoPermission(Permissions.FSE_PPCFileSystemRead); @@ -289,7 +293,7 @@ namespace Tango.FSE.UI.FileSystem FileSystemHandler handler = null; - if (isSingleFile) + if (isLocalTargetFile) { destination = localTargetFolderOrFile; } @@ -537,6 +541,32 @@ namespace Tango.FSE.UI.FileSystem } /// <summary> + /// Downloads the specified file or folder item. + /// </summary> + /// <param name="remotePath">The remote file or folder.</param> + /// <param name="isRemotePathFile">Indicates whether the remote path is a file.</param> + /// <param name="localTargetFolderOrFile">The local target folder or file.</param> + /// <param name="isLocalTargetFile">Indicates whether the localTargetFolder is a file.</param> + /// <returns></returns> + public Task<FileSystemHandler> Download(String remotePath, bool isRemotePathFile, String localTargetFolderOrFile, bool isLocalTargetFile = false) + { + FileSystemItem item = null; + + if (isRemotePathFile) + { + item = new FileItem(); + } + else + { + item = new FolderItem(); + } + + item.Path = remotePath; + + return Download(item, localTargetFolderOrFile, isLocalTargetFile); + } + + /// <summary> /// Uploads the specified local file or folder. /// </summary> /// <param name="localSourcePath">The local source path.</param> |
