|
|
@ -1,6 +1,7 @@
|
|
|
|
using System;
|
|
|
|
using System;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.IO;
|
|
|
|
using System.IO;
|
|
|
|
|
|
|
|
using ZeroLevel.Models;
|
|
|
|
using ZeroLevel.Services.Network.FileTransfer.Model;
|
|
|
|
using ZeroLevel.Services.Network.FileTransfer.Model;
|
|
|
|
|
|
|
|
|
|
|
|
namespace ZeroLevel.Services.Network.FileTransfer
|
|
|
|
namespace ZeroLevel.Services.Network.FileTransfer
|
|
|
@ -40,10 +41,12 @@ namespace ZeroLevel.Services.Network.FileTransfer
|
|
|
|
private string _basePath;
|
|
|
|
private string _basePath;
|
|
|
|
private string _disk_prefix;
|
|
|
|
private string _disk_prefix;
|
|
|
|
|
|
|
|
|
|
|
|
private readonly Dictionary<int, FileWriter> _incoming = new Dictionary<int, FileWriter>();
|
|
|
|
private readonly Dictionary<long, FileWriter> _incoming = new Dictionary<long, FileWriter>();
|
|
|
|
private readonly object _locker = new object();
|
|
|
|
private readonly object _locker = new object();
|
|
|
|
private long _cleanErrorsTaskId;
|
|
|
|
private long _cleanErrorsTaskId;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private readonly Dictionary<long, object> _incomingLocks = new Dictionary<long, object>();
|
|
|
|
|
|
|
|
|
|
|
|
public FileReceiver(string path, string disk_prefix = "DRIVE_")
|
|
|
|
public FileReceiver(string path, string disk_prefix = "DRIVE_")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_disk_prefix = disk_prefix;
|
|
|
|
_disk_prefix = disk_prefix;
|
|
|
@ -68,37 +71,65 @@ namespace ZeroLevel.Services.Network.FileTransfer
|
|
|
|
|
|
|
|
|
|
|
|
public void Incoming(FileStartFrame info, string clientFolderName)
|
|
|
|
public void Incoming(FileStartFrame info, string clientFolderName)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (false == _incoming.ContainsKey(info.FileUploadTaskId))
|
|
|
|
try
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (false == _incoming.ContainsKey(info.UploadFileTaskId))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
lock (_locker)
|
|
|
|
lock (_locker)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (false == _incoming.ContainsKey(info.FileUploadTaskId))
|
|
|
|
if (false == _incoming.ContainsKey(info.UploadFileTaskId))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
_incomingLocks.Add(info.UploadFileTaskId, new object());
|
|
|
|
|
|
|
|
lock (_incomingLocks[info.UploadFileTaskId])
|
|
|
|
{
|
|
|
|
{
|
|
|
|
string path = BuildFilePath(clientFolderName, info.FilePath);
|
|
|
|
string path = BuildFilePath(clientFolderName, info.FilePath);
|
|
|
|
_incoming.Add(info.FileUploadTaskId, new FileWriter(path));
|
|
|
|
_incoming.Add(info.UploadFileTaskId, new FileWriter(path));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Log.Error("[FileReceiver]", ex);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void Incoming(FileFrame chunk)
|
|
|
|
public void Incoming(FileFrame chunk)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
FileWriter stream;
|
|
|
|
FileWriter stream;
|
|
|
|
if (_incoming.TryGetValue(chunk.UploadTaskId, out stream))
|
|
|
|
if (_incoming.TryGetValue(chunk.UploadFileTaskId, out stream))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
lock (_incomingLocks[chunk.UploadFileTaskId])
|
|
|
|
{
|
|
|
|
{
|
|
|
|
stream.Write(chunk.Offset, chunk.Payload);
|
|
|
|
stream.Write(chunk.Offset, chunk.Payload);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Log.Error("[FileReceiver]", ex);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void Incoming(FileEndFrame info)
|
|
|
|
public void Incoming(FileEndFrame info)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
lock (_locker)
|
|
|
|
lock (_locker)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Remove(info.FileUploadTaskId);
|
|
|
|
Remove(info.UploadFileTaskId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Log.Error("[FileReceiver]", ex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void Remove(int uploadTaskId)
|
|
|
|
private void Remove(long uploadTaskId)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
FileWriter stream;
|
|
|
|
FileWriter stream;
|
|
|
|
if (_incoming.TryGetValue(uploadTaskId, out stream))
|
|
|
|
if (_incoming.TryGetValue(uploadTaskId, out stream))
|
|
|
|