Horizon – Diff between revs 20 and 21
?pathlinks?
Rev 20 | Rev 21 | |||
---|---|---|---|---|
Line 705... | Line 705... | |||
705 | } |
705 | } |
|
Line 706... | Line 706... | |||
706 | |
706 | |
|
707 | var discoveredServiceMenuItem = new ToolStripMenuItem(service.Name, null, OnShareWithNodeClicked); |
707 | var discoveredServiceMenuItem = new ToolStripMenuItem(service.Name, null, OnShareWithNodeClicked); |
|
Line -... | Line 708... | |||
- | 708 | discoveredServiceMenuItem.Tag = service; |
||
- | 709 | |
||
708 | discoveredServiceMenuItem.Tag = service; |
710 | this.InvokeIfRequired(form => |
|
- | 711 | { |
||
709 | |
712 | form.shareToToolStripMenuItem.DropDownItems.Add(discoveredServiceMenuItem); |
|
Line 710... | Line 713... | |||
710 | shareToToolStripMenuItem.DropDownItems.Add(discoveredServiceMenuItem); |
713 | }); |
|
711 | } |
714 | } |
|
712 | |
715 | |
|
Line 1556... | Line 1559... | |||
1556 | private async Task TransferFiles(IReadOnlyList<DataGridViewRow> rows, Service service, |
1559 | private async Task TransferFiles(IReadOnlyList<DataGridViewRow> rows, Service service, |
|
1557 | IProgress<DataGridViewRowProgress> progress, CancellationToken cancellationToken) |
1560 | IProgress<DataGridViewRowProgress> progress, CancellationToken cancellationToken) |
|
1558 | { |
1561 | { |
|
Line 1559... | Line 1562... | |||
1559 | |
1562 | |
|
1560 | var client = new WatsonTcpClient($"{service.HostEntry.AddressList[0]}", service.UPort); |
1563 | var client = new WatsonTcpClient($"{service.HostEntry.AddressList[0]}", service.UPort); |
|
1561 | client.Events.MessageReceived += (sender, args) => |
1564 | client.Events.MessageReceived += Events_MessageReceived; |
|
1562 | { |
1565 | client.Events.ServerConnected += Events_ServerConnected; |
|
1563 | Log.Information($"{args.Data.Length} byte long message received from {args.Client.IpPort}"); |
1566 | client.Events.ServerDisconnected += Events_ServerDisconnected; |
|
Line 1564... | Line 1567... | |||
1564 | }; |
1567 | client.Events.ExceptionEncountered += Events_ExceptionEncountered; |
|
1565 | |
1568 | |
|
1566 | try |
1569 | try |
|
Line 1571... | Line 1574... | |||
1571 | |
1574 | |
|
1572 | for (var i = 0; i < count && !cancellationToken.IsCancellationRequested; ++i) |
1575 | for (var i = 0; i < count && !cancellationToken.IsCancellationRequested; ++i) |
|
1573 | { |
1576 | { |
|
1574 | try |
1577 | try |
|
- | 1578 | { |
||
- | 1579 | var completeSnapshot = |
||
1575 | { |
1580 | await _snapshotDatabase.GenerateTransferSnapshotAsync( |
|
Line 1576... | Line 1581... | |||
1576 | var completeSnapshot = await _snapshotDatabase.GenerateTransferSnapshotAsync((string)rows[i].Cells["HashColumn"].Value, cancellationToken); |
1581 | (string)rows[i].Cells["HashColumn"].Value, cancellationToken); |
|
Line 1577... | Line 1582... | |||
1577 | |
1582 | |
|
Line 1585... | Line 1590... | |||
1585 | { |
1590 | { |
|
1586 | progress.Report(new DataGridViewRowProgressFailure(rows[i], i, exception)); |
1591 | progress.Report(new DataGridViewRowProgressFailure(rows[i], i, exception)); |
|
1587 | } |
1592 | } |
|
1588 | } |
1593 | } |
|
1589 | } |
1594 | } |
|
- | 1595 | catch (SocketException exception) |
||
- | 1596 | { |
||
- | 1597 | Log.Error(exception, "Client threw exception."); |
||
- | 1598 | } |
||
1590 | finally |
1599 | finally |
|
1591 | { |
1600 | { |
|
- | 1601 | client.Events.MessageReceived -= Events_MessageReceived; |
||
- | 1602 | client.Events.ServerConnected -= Events_ServerConnected; |
||
- | 1603 | client.Events.ServerDisconnected -= Events_ServerDisconnected; |
||
- | 1604 | client.Events.ExceptionEncountered -= Events_ExceptionEncountered; |
||
- | 1605 | |
||
1592 | client.Dispose(); |
1606 | client.Dispose(); |
|
1593 | } |
1607 | } |
|
1594 | |
1608 | |
|
- | 1609 | } |
||
- | 1610 | |
||
- | 1611 | private void Events_ExceptionEncountered(object sender, ExceptionEventArgs e) |
||
- | 1612 | { |
||
- | 1613 | Log.Error(e.Exception, $"Client threw exception."); |
||
- | 1614 | } |
||
- | 1615 | |
||
- | 1616 | private void Events_ServerDisconnected(object sender, DisconnectionEventArgs e) |
||
- | 1617 | { |
||
- | 1618 | Log.Information($"{e.Client?.IpPort} connected to server due to: {e.Reason}."); |
||
- | 1619 | } |
||
- | 1620 | |
||
- | 1621 | private void Events_MessageReceived(object sender, MessageReceivedEventArgs e) |
||
- | 1622 | { |
||
- | 1623 | Log.Information($"{e.Data?.Length} byte long message received from {e.Client?.IpPort}"); |
||
- | 1624 | } |
||
- | 1625 | |
||
- | 1626 | private void Events_ServerConnected(object sender, WatsonTcp.ConnectionEventArgs e) |
||
- | 1627 | { |
||
- | 1628 | Log.Information($"{e.Client?.IpPort} connected to server."); |
||
1595 | } |
1629 | } |
|
Line 1596... | Line 1630... | |||
1596 | |
1630 | |
|
1597 | private async Task RevertFile(IReadOnlyList<DataGridViewRow> rows, IProgress<DataGridViewRowProgress> progress, |
1631 | private async Task RevertFile(IReadOnlyList<DataGridViewRow> rows, IProgress<DataGridViewRowProgress> progress, |
|
1598 | CancellationToken cancellationToken) |
1632 | CancellationToken cancellationToken) |