From 4f3fa6ecec6ce82d59b911f2505d321b4942c7c7 Mon Sep 17 00:00:00 2001
From: gary <gary.ruben@monash.edu>
Date: Thu, 14 Mar 2019 11:31:24 +1100
Subject: [PATCH] fixed file count logic
---
asci_to_vault.py | 6 +++---
md5_to_vault.py | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/asci_to_vault.py b/asci_to_vault.py
index 7fd4feb..ca32609 100644
--- a/asci_to_vault.py
+++ b/asci_to_vault.py
@@ -54,7 +54,7 @@ from fabric import Connection
READ_PICKLE_FILE = False
-EXPERIMENT_NAME = "13660b"
+EXPERIMENT_NAME = "13660a"
PICKLE_FILENAME = os.path.join(os.path.dirname(__file__), "tree_state.pickle")
timestamp = time.strftime("%Y-%m-%d-%H%M%S")
LOG_FILENAME = os.path.join(
@@ -63,7 +63,7 @@ LOG_FILENAME = os.path.join(
)
REMOTE_LOGIN = "gary.ruben@monash.edu@sftp1.synchrotron.org.au"
SRC_PATH = f"/data/{EXPERIMENT_NAME}/asci/output"
-DEST_PATH = "/home/grub0002/bapcxi/vault/IMBL_2018_Oct_McGillick"
+DEST_PATH = "/home/grub0002/bapcxi/vault/IMBL_2018_Oct_McGillick/output"
@dataclass
@@ -116,7 +116,7 @@ def tar_and_send_directory(node):
# print(f'Connection failed on {node.src}')
# node.error = "Connection failure on initial file find"
# return
- node.count = files.count('\n')
+ node.count = len(files.splitlines())
print(f'Node:{node.src}, file count:{node.count}')
if node.count == 0:
diff --git a/md5_to_vault.py b/md5_to_vault.py
index 1934012..db9885c 100644
--- a/md5_to_vault.py
+++ b/md5_to_vault.py
@@ -46,8 +46,8 @@ LOG_FILENAME = os.path.join(
f"md5-{EXPERIMENT_NAME}-{timestamp}.log"
)
REMOTE_LOGIN = "gary.ruben@monash.edu@sftp2.synchrotron.org.au"
-SRC_PATH = f"/data/{EXPERIMENT_NAME}/asci/input"
-DEST_PATH = "/home/grub0002/bapcxi/vault/IMBL_2018_Oct_McGillick"
+SRC_PATH = f"/data/{EXPERIMENT_NAME}/asci/output"
+DEST_PATH = "/home/grub0002/bapcxi/vault/IMBL_2018_Oct_McGillick/output"
@dataclass
@@ -95,7 +95,7 @@ def send_checksum(node):
echo=True
)
files = files.stdout.strip()
- node.count = files.count('\n')
+ node.count = len(files.splitlines())
print(f'Node:{node.src}, file count:{node.count}')
if node.count == 0:
--
GitLab