From a994ceaa728d56726df73a4660e870488f9eb3cf Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Mon, 13 Sep 2021 16:39:45 -0600
Subject: [PATCH] correcting move images out of subdirs
---
.../0953fe9fb794_fix_subdir_removal.py | 88 +++++++++++++++++++
1 file changed, 88 insertions(+)
create mode 100644 schema/versions/0953fe9fb794_fix_subdir_removal.py
diff --git a/schema/versions/0953fe9fb794_fix_subdir_removal.py b/schema/versions/0953fe9fb794_fix_subdir_removal.py
new file mode 100644
index 000000000..9c0ec71b2
--- /dev/null
+++ b/schema/versions/0953fe9fb794_fix_subdir_removal.py
@@ -0,0 +1,88 @@
+"""fix subdir removal
+
+Revision ID: 0953fe9fb794
+Revises: 42723a9dd85c
+Create Date: 2021-09-13 16:38:13.209103
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "0953fe9fb794"
+down_revision = "42723a9dd85c"
+branch_labels = None
+depends_on = None
+
+script_content = """#!/bin/sh
+set -o errexit
+
+export HOME=$TMPDIR
+
+fetch_foundation(){
+ ../productfetcher{{product_locator}}
+
+ echo "Moving images out of subdirectories...."
+ for dir in *.fits; do mv $dir $dir.l; done;
+
+ find . -mindepth 1 -type f -print -exec mv {} . \;
+ find . -mindepth 1 -type d -empty -delete
+ echo "Done. Ready for Carta!"
+}
+
+
+{{#need_data}}
+./framework.sh -r .
+chmod 770 .
+cd rawdata/
+
+fetch_foundation {{^single_image}}&{{/single_image}}
+
+.{{/need_data}}./carta_envoy {{#need_data}}--parallel{{/need_data}} {{#single_image}}--single -i {{imageName}}{{/single_image}} -d $1 -n $2 -wf $3 -r $4
+{{#need_data}}wait{{/need_data}}
+
+"""
+
+old_content = """#!/bin/sh
+set -o errexit
+
+export HOME=$TMPDIR
+
+{{#need_data}}
+./framework.sh -r .
+chmod 770 .
+cd rawdata/
+../productfetcher{{product_locator}} {{^single_image}}&{{/single_image}}
+
+image_subdirs=$(ls)
+
+for i in $image_subdirs; do
+ if [[ -d "./$i" ]]; then
+ mv "./$i"/* .
+ rm -rf "./$i"
+ fi
+done
+
+.{{/need_data}}./carta_envoy {{#need_data}}--parallel{{/need_data}} {{#single_image}}--single -i {{imageName}}{{/single_image}} -d $1 -n $2 -wf $3 -r $4
+{{#need_data}}wait{{/need_data}}
+
+"""
+
+
+def upgrade():
+ op.execute(
+ f"""
+ UPDATE workflow_templates
+ SET content=E'{script_content}' where filename='carta.sh'
+ """
+ )
+
+
+def downgrade():
+ op.execute(
+ f"""
+ UPDATE workflow_templates
+ SET content=E'{old_content}' where filename='carta.sh'
+ """
+ )
--
GitLab