From 215927d432243ce4c8284ea8d644481f4b3ecd44 Mon Sep 17 00:00:00 2001 From: ChristianVisintin Date: Sat, 16 Jan 2021 15:13:58 +0100 Subject: [PATCH 1/3] Fixed copyright header --- src/activity_manager.rs | 2 +- src/bookmarks/mod.rs | 2 +- src/bookmarks/serializer.rs | 2 +- src/config/mod.rs | 2 +- src/config/serializer.rs | 2 +- src/filetransfer/ftp_transfer.rs | 2 +- src/filetransfer/mod.rs | 2 +- src/filetransfer/scp_transfer.rs | 2 +- src/filetransfer/sftp_transfer.rs | 2 +- src/fs/explorer/builder.rs | 2 +- src/fs/explorer/mod.rs | 2 +- src/fs/mod.rs | 2 +- src/host/mod.rs | 2 +- src/lib.rs | 2 +- src/main.rs | 2 +- src/system/bookmarks_client.rs | 2 +- src/system/config_client.rs | 2 +- src/system/environment.rs | 2 +- src/system/mod.rs | 2 +- src/system/sshkey_storage.rs | 2 +- src/ui/activities/auth_activity/bookmarks.rs | 2 +- src/ui/activities/auth_activity/callbacks.rs | 2 +- src/ui/activities/auth_activity/input.rs | 2 +- src/ui/activities/auth_activity/layout.rs | 2 +- src/ui/activities/auth_activity/mod.rs | 2 +- src/ui/activities/filetransfer_activity/callbacks.rs | 2 +- src/ui/activities/filetransfer_activity/input.rs | 2 +- src/ui/activities/filetransfer_activity/layout.rs | 2 +- src/ui/activities/filetransfer_activity/misc.rs | 2 +- src/ui/activities/filetransfer_activity/mod.rs | 2 +- src/ui/activities/filetransfer_activity/session.rs | 2 +- src/ui/activities/mod.rs | 2 +- src/ui/activities/setup_activity/callbacks.rs | 2 +- src/ui/activities/setup_activity/config.rs | 2 +- src/ui/activities/setup_activity/input.rs | 2 +- src/ui/activities/setup_activity/layout.rs | 2 +- src/ui/activities/setup_activity/misc.rs | 2 +- src/ui/activities/setup_activity/mod.rs | 2 +- src/ui/context.rs | 2 +- src/ui/input.rs | 2 +- src/ui/mod.rs | 2 +- src/utils/crypto.rs | 2 +- src/utils/fmt.rs | 2 +- src/utils/mod.rs | 2 +- src/utils/parser.rs | 2 +- src/utils/random.rs | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/activity_manager.rs b/src/activity_manager.rs index d36b4c9..b8964a0 100644 --- a/src/activity_manager.rs +++ b/src/activity_manager.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/bookmarks/mod.rs b/src/bookmarks/mod.rs index 331d412..6171916 100644 --- a/src/bookmarks/mod.rs +++ b/src/bookmarks/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/bookmarks/serializer.rs b/src/bookmarks/serializer.rs index 4835f26..5204b2e 100644 --- a/src/bookmarks/serializer.rs +++ b/src/bookmarks/serializer.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/config/mod.rs b/src/config/mod.rs index 6178a51..05f23a8 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/config/serializer.rs b/src/config/serializer.rs index e2d62a3..89334d1 100644 --- a/src/config/serializer.rs +++ b/src/config/serializer.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/ftp_transfer.rs index 7fa03b5..bee6440 100644 --- a/src/filetransfer/ftp_transfer.rs +++ b/src/filetransfer/ftp_transfer.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs index 92d5af5..3a561f4 100644 --- a/src/filetransfer/mod.rs +++ b/src/filetransfer/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/filetransfer/scp_transfer.rs b/src/filetransfer/scp_transfer.rs index 5cd2351..281048d 100644 --- a/src/filetransfer/scp_transfer.rs +++ b/src/filetransfer/scp_transfer.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/filetransfer/sftp_transfer.rs b/src/filetransfer/sftp_transfer.rs index 9e2622b..9ef2d8c 100644 --- a/src/filetransfer/sftp_transfer.rs +++ b/src/filetransfer/sftp_transfer.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/fs/explorer/builder.rs b/src/fs/explorer/builder.rs index 2e16dcc..41ba028 100644 --- a/src/fs/explorer/builder.rs +++ b/src/fs/explorer/builder.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/fs/explorer/mod.rs b/src/fs/explorer/mod.rs index 2d1a3e0..4a0a4fc 100644 --- a/src/fs/explorer/mod.rs +++ b/src/fs/explorer/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/fs/mod.rs b/src/fs/mod.rs index ea718a9..96f14e8 100644 --- a/src/fs/mod.rs +++ b/src/fs/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/host/mod.rs b/src/host/mod.rs index 2411991..9aec7c1 100644 --- a/src/host/mod.rs +++ b/src/host/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/lib.rs b/src/lib.rs index d65280e..280e257 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/main.rs b/src/main.rs index f7f8a9b..52de229 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/system/bookmarks_client.rs b/src/system/bookmarks_client.rs index 7d98028..c65fbea 100644 --- a/src/system/bookmarks_client.rs +++ b/src/system/bookmarks_client.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/system/config_client.rs b/src/system/config_client.rs index 9463269..3bb7174 100644 --- a/src/system/config_client.rs +++ b/src/system/config_client.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/system/environment.rs b/src/system/environment.rs index 29798b3..0b994ae 100644 --- a/src/system/environment.rs +++ b/src/system/environment.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/system/mod.rs b/src/system/mod.rs index b31a84c..2e2e624 100644 --- a/src/system/mod.rs +++ b/src/system/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/system/sshkey_storage.rs b/src/system/sshkey_storage.rs index 20eb8b2..cab222e 100644 --- a/src/system/sshkey_storage.rs +++ b/src/system/sshkey_storage.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/auth_activity/bookmarks.rs b/src/ui/activities/auth_activity/bookmarks.rs index f035b9d..f9f553d 100644 --- a/src/ui/activities/auth_activity/bookmarks.rs +++ b/src/ui/activities/auth_activity/bookmarks.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/auth_activity/callbacks.rs b/src/ui/activities/auth_activity/callbacks.rs index 645f6ca..db4bf1e 100644 --- a/src/ui/activities/auth_activity/callbacks.rs +++ b/src/ui/activities/auth_activity/callbacks.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/auth_activity/input.rs b/src/ui/activities/auth_activity/input.rs index 6f9fb33..e939503 100644 --- a/src/ui/activities/auth_activity/input.rs +++ b/src/ui/activities/auth_activity/input.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/auth_activity/layout.rs b/src/ui/activities/auth_activity/layout.rs index 7368bc3..a779aa1 100644 --- a/src/ui/activities/auth_activity/layout.rs +++ b/src/ui/activities/auth_activity/layout.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/auth_activity/mod.rs b/src/ui/activities/auth_activity/mod.rs index f1fa96c..95de2b9 100644 --- a/src/ui/activities/auth_activity/mod.rs +++ b/src/ui/activities/auth_activity/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/filetransfer_activity/callbacks.rs b/src/ui/activities/filetransfer_activity/callbacks.rs index 702082c..7dbf8e6 100644 --- a/src/ui/activities/filetransfer_activity/callbacks.rs +++ b/src/ui/activities/filetransfer_activity/callbacks.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/filetransfer_activity/input.rs b/src/ui/activities/filetransfer_activity/input.rs index 23ecc83..8abc8fc 100644 --- a/src/ui/activities/filetransfer_activity/input.rs +++ b/src/ui/activities/filetransfer_activity/input.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/filetransfer_activity/layout.rs b/src/ui/activities/filetransfer_activity/layout.rs index 4cf3600..641a2f6 100644 --- a/src/ui/activities/filetransfer_activity/layout.rs +++ b/src/ui/activities/filetransfer_activity/layout.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/filetransfer_activity/misc.rs b/src/ui/activities/filetransfer_activity/misc.rs index 3c0c286..e9cb9dd 100644 --- a/src/ui/activities/filetransfer_activity/misc.rs +++ b/src/ui/activities/filetransfer_activity/misc.rs @@ -1,6 +1,6 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/filetransfer_activity/mod.rs b/src/ui/activities/filetransfer_activity/mod.rs index e6b9aeb..e011bb3 100644 --- a/src/ui/activities/filetransfer_activity/mod.rs +++ b/src/ui/activities/filetransfer_activity/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/filetransfer_activity/session.rs b/src/ui/activities/filetransfer_activity/session.rs index c3e19f2..9d53ac1 100644 --- a/src/ui/activities/filetransfer_activity/session.rs +++ b/src/ui/activities/filetransfer_activity/session.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/mod.rs b/src/ui/activities/mod.rs index dc188ab..70bf591 100644 --- a/src/ui/activities/mod.rs +++ b/src/ui/activities/mod.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/setup_activity/callbacks.rs b/src/ui/activities/setup_activity/callbacks.rs index 98205ce..9074124 100644 --- a/src/ui/activities/setup_activity/callbacks.rs +++ b/src/ui/activities/setup_activity/callbacks.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/setup_activity/config.rs b/src/ui/activities/setup_activity/config.rs index 7867c79..fad56d8 100644 --- a/src/ui/activities/setup_activity/config.rs +++ b/src/ui/activities/setup_activity/config.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/setup_activity/input.rs b/src/ui/activities/setup_activity/input.rs index 38ab98d..cdd7894 100644 --- a/src/ui/activities/setup_activity/input.rs +++ b/src/ui/activities/setup_activity/input.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/setup_activity/layout.rs b/src/ui/activities/setup_activity/layout.rs index 45ef475..e951f75 100644 --- a/src/ui/activities/setup_activity/layout.rs +++ b/src/ui/activities/setup_activity/layout.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/setup_activity/misc.rs b/src/ui/activities/setup_activity/misc.rs index 695c015..025cc5c 100644 --- a/src/ui/activities/setup_activity/misc.rs +++ b/src/ui/activities/setup_activity/misc.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/activities/setup_activity/mod.rs b/src/ui/activities/setup_activity/mod.rs index 724d06c..57ef6ce 100644 --- a/src/ui/activities/setup_activity/mod.rs +++ b/src/ui/activities/setup_activity/mod.rs @@ -5,7 +5,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/context.rs b/src/ui/context.rs index df382f5..1e68941 100644 --- a/src/ui/context.rs +++ b/src/ui/context.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/input.rs b/src/ui/input.rs index bb7931b..87835b6 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 31da84e..0e8d9c8 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/utils/crypto.rs b/src/utils/crypto.rs index 68faa45..f3dcb08 100644 --- a/src/utils/crypto.rs +++ b/src/utils/crypto.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/utils/fmt.rs b/src/utils/fmt.rs index 939ee02..498f94b 100644 --- a/src/utils/fmt.rs +++ b/src/utils/fmt.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/utils/mod.rs b/src/utils/mod.rs index cb298e1..ea844e7 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/utils/parser.rs b/src/utils/parser.rs index 271f4aa..b2ca6e9 100644 --- a/src/utils/parser.rs +++ b/src/utils/parser.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * diff --git a/src/utils/random.rs b/src/utils/random.rs index 335f0ae..8622b4c 100644 --- a/src/utils/random.rs +++ b/src/utils/random.rs @@ -4,7 +4,7 @@ /* * -* Copyright (C) 2020-2021Christian Visintin - christian.visintin1997@gmail.com +* Copyright (C) 2020-2021 Christian Visintin - christian.visintin1997@gmail.com * * This file is part of "TermSCP" * From 367fb235f6cfdd45d34ae47392876cb00533d2a9 Mon Sep 17 00:00:00 2001 From: Vitaliy Busko Date: Mon, 18 Jan 2021 10:51:22 +0700 Subject: [PATCH 2/3] Refactoring FtpFileTransfer::parse_unix_list_line --- src/filetransfer/ftp_transfer.rs | 74 ++++++++++---------------------- 1 file changed, 22 insertions(+), 52 deletions(-) diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/ftp_transfer.rs index bee6440..ad01f24 100644 --- a/src/filetransfer/ftp_transfer.rs +++ b/src/filetransfer/ftp_transfer.rs @@ -36,9 +36,12 @@ use crate::utils::parser::{parse_datetime, parse_lstime}; use ftp4::native_tls::TlsConnector; use ftp4::FtpStream; use regex::Regex; -use std::io::{Read, Write}; use std::path::{Path, PathBuf}; use std::time::SystemTime; +use std::{ + io::{Read, Write}, + ops::Range, +}; /// ## FtpFileTransfer /// @@ -105,61 +108,28 @@ impl FtpFileTransfer { if metadata.get(2).unwrap().as_str().len() < 9 { return Err(()); } - // Get unix pex - let unix_pex: (u8, u8, u8) = { - let owner_pex: u8 = { - let mut count: u8 = 0; - for (i, c) in metadata.get(2).unwrap().as_str()[0..3].chars().enumerate() { - match c { - '-' => {} - _ => { - count += match i { - 0 => 4, - 1 => 2, - 2 => 1, - _ => 0, - } + + let pex = |range: Range| { + let mut count: u8 = 0; + for (i, c) in metadata.get(2).unwrap().as_str()[range].chars().enumerate() { + match c { + '-' => {} + _ => { + count += match i { + 0 => 4, + 1 => 2, + 2 => 1, + _ => 0, } } } - count - }; - let group_pex: u8 = { - let mut count: u8 = 0; - for (i, c) in metadata.get(2).unwrap().as_str()[3..6].chars().enumerate() { - match c { - '-' => {} - _ => { - count += match i { - 0 => 4, - 1 => 2, - 2 => 1, - _ => 0, - } - } - } - } - count - }; - let others_pex: u8 = { - let mut count: u8 = 0; - for (i, c) in metadata.get(2).unwrap().as_str()[6..9].chars().enumerate() { - match c { - '-' => {} - _ => { - count += match i { - 0 => 4, - 1 => 2, - 2 => 1, - _ => 0, - } - } - } - } - count - }; - (owner_pex, group_pex, others_pex) + } + count }; + + // Get unix pex + let unix_pex = (pex(0..3), pex(3..6), pex(6..9)); + // Parse mtime and convert to SystemTime let mtime: SystemTime = match parse_lstime( metadata.get(7).unwrap().as_str(), From d7e5eacd795f4b8068a067261539cd4338efdc63 Mon Sep 17 00:00:00 2001 From: Vitaliy Busko Date: Mon, 18 Jan 2021 11:31:35 +0700 Subject: [PATCH 3/3] Refactoring ScpFileTransfer::parse_ls_output --- src/filetransfer/scp_transfer.rs | 74 ++++++++++---------------------- 1 file changed, 22 insertions(+), 52 deletions(-) diff --git a/src/filetransfer/scp_transfer.rs b/src/filetransfer/scp_transfer.rs index 281048d..1ada5bf 100644 --- a/src/filetransfer/scp_transfer.rs +++ b/src/filetransfer/scp_transfer.rs @@ -36,10 +36,13 @@ use crate::utils::parser::parse_lstime; // Includes use regex::Regex; use ssh2::{Channel, Session}; -use std::io::{BufReader, BufWriter, Read, Write}; use std::net::TcpStream; use std::path::{Path, PathBuf}; use std::time::SystemTime; +use std::{ + io::{BufReader, BufWriter, Read, Write}, + ops::Range, +}; /// ## ScpFileTransfer /// @@ -92,61 +95,28 @@ impl ScpFileTransfer { if metadata.get(2).unwrap().as_str().len() < 9 { return Err(()); } - // Get unix pex - let unix_pex: (u8, u8, u8) = { - let owner_pex: u8 = { - let mut count: u8 = 0; - for (i, c) in metadata.get(2).unwrap().as_str()[0..3].chars().enumerate() { - match c { - '-' => {} - _ => { - count += match i { - 0 => 4, - 1 => 2, - 2 => 1, - _ => 0, - } + + let pex = |range: Range| { + let mut count: u8 = 0; + for (i, c) in metadata.get(2).unwrap().as_str()[range].chars().enumerate() { + match c { + '-' => {} + _ => { + count += match i { + 0 => 4, + 1 => 2, + 2 => 1, + _ => 0, } } } - count - }; - let group_pex: u8 = { - let mut count: u8 = 0; - for (i, c) in metadata.get(2).unwrap().as_str()[3..6].chars().enumerate() { - match c { - '-' => {} - _ => { - count += match i { - 0 => 4, - 1 => 2, - 2 => 1, - _ => 0, - } - } - } - } - count - }; - let others_pex: u8 = { - let mut count: u8 = 0; - for (i, c) in metadata.get(2).unwrap().as_str()[6..9].chars().enumerate() { - match c { - '-' => {} - _ => { - count += match i { - 0 => 4, - 1 => 2, - 2 => 1, - _ => 0, - } - } - } - } - count - }; - (owner_pex, group_pex, others_pex) + } + count }; + + // Get unix pex + let unix_pex = (pex(0..3), pex(3..6), pex(6..9)); + // Parse mtime and convert to SystemTime let mtime: SystemTime = match parse_lstime( metadata.get(7).unwrap().as_str(),