From ecd3c1582dba078a7a30298faa444d84bf5e8ed8 Mon Sep 17 00:00:00 2001 From: Mario Rial Date: Wed, 21 Sep 2016 14:48:12 +0000 Subject: [PATCH 1/5] Main commit obligatory part --- generate.sh | 67 ++++++++++++++++++++++++++++++++++++++++++-- template.html | 4 +-- tests/test_random.py | 2 +- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/generate.sh b/generate.sh index 51652b1..4def40b 100755 --- a/generate.sh +++ b/generate.sh @@ -1,5 +1,68 @@ #!/bin/bash -set -ex +#set -ex -# YOUR CODE HERE +input=$1 +output=$2 + + +echo "Input Dir: $input" +echo "Output Dir: $output" + +#Create output directory structure if it doesn't exist. +mkdir -p $output + +#Embedbed template +template=' + + + + {{title}} + + + {{body}} + + +' + +for filename in $input/*.txt; do + message="" + title="" + i=0 + destFilename=$(basename $filename | sed "s/.txt/.html/") + + #echo "File: $filename" + #echo "Dest Filename: $destFilename" + echo "Archivo:" + cat $filename + echo -e "\n" + + while read -r line + do + echo "$i Linea: $line" + if [ $i -eq 0 ] + then + title=$line + fi + if [ $i -gt 1 ] + then + if [ -z "$message" ] + then + message="$line" + else + message="$message\n$line" + fi + + fi + i=$(($i+1)) + done < $filename + + + #echo "TITLE: $title" + #echo "Message: $message" + + #Tricks to allow multiline messages with sed... + echo -e "$(echo -e "$template" | sed "s@{{title}}@$title@" | sed "s@{{body}}@$message@")" > $output/$destFilename + + #echo "_____________________" +done diff --git a/template.html b/template.html index f196151..4782f5c 100644 --- a/template.html +++ b/template.html @@ -2,9 +2,9 @@ - {{title}} + - {{body}} + diff --git a/tests/test_random.py b/tests/test_random.py index f8679cc..db90177 100644 --- a/tests/test_random.py +++ b/tests/test_random.py @@ -16,7 +16,7 @@ def write_to(self, dirpath): with open(filepath, 'w') as f: f.write(self.title) f.write("\n\n") - f.write(self.body) + f.write(self.body+"\n") @pytest.fixture def input_dir(): From e9515ef7026c1d567207d6bbeece48b59ac8db53 Mon Sep 17 00:00:00 2001 From: Mario Rial Date: Wed, 21 Sep 2016 21:34:42 +0000 Subject: [PATCH 2/5] code climate errors fix --- generate.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/generate.sh b/generate.sh index 4def40b..b000b9b 100755 --- a/generate.sh +++ b/generate.sh @@ -10,7 +10,7 @@ echo "Input Dir: $input" echo "Output Dir: $output" #Create output directory structure if it doesn't exist. -mkdir -p $output +mkdir -p "$output" #Embedbed template template=' @@ -29,12 +29,12 @@ for filename in $input/*.txt; do message="" title="" i=0 - destFilename=$(basename $filename | sed "s/.txt/.html/") + destFilename="$(basename $filename | sed "s/.txt/.html/")" #echo "File: $filename" #echo "Dest Filename: $destFilename" echo "Archivo:" - cat $filename + cat "$filename" echo -e "\n" while read -r line @@ -55,14 +55,14 @@ for filename in $input/*.txt; do fi i=$(($i+1)) - done < $filename + done < "$filename" #echo "TITLE: $title" #echo "Message: $message" #Tricks to allow multiline messages with sed... - echo -e "$(echo -e "$template" | sed "s@{{title}}@$title@" | sed "s@{{body}}@$message@")" > $output/$destFilename + echo -e "$(echo -e "$template" | sed "s@{{title}}@$title@" | sed "s@{{body}}@$message@")" > "$output/$destFilename" #echo "_____________________" done From 19998bca4f587261bafa159338f51138bf079e5c Mon Sep 17 00:00:00 2001 From: Mario Rial Date: Wed, 21 Sep 2016 21:36:50 +0000 Subject: [PATCH 3/5] code climate errors fix --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index b000b9b..e1b7dd6 100755 --- a/generate.sh +++ b/generate.sh @@ -29,7 +29,7 @@ for filename in $input/*.txt; do message="" title="" i=0 - destFilename="$(basename $filename | sed "s/.txt/.html/")" + destFilename="$(basename $filename | sed 's/.txt/.html/')" #echo "File: $filename" #echo "Dest Filename: $destFilename" From 72f4bdb3959b636fa75011d154cb580f117c1c18 Mon Sep 17 00:00:00 2001 From: Mario Rial Date: Wed, 21 Sep 2016 21:38:04 +0000 Subject: [PATCH 4/5] code climate errors fix --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index e1b7dd6..64d81bf 100755 --- a/generate.sh +++ b/generate.sh @@ -29,7 +29,7 @@ for filename in $input/*.txt; do message="" title="" i=0 - destFilename="$(basename $filename | sed 's/.txt/.html/')" + destFilename="$(basename "$filename" | sed 's/.txt/.html/')" #echo "File: $filename" #echo "Dest Filename: $destFilename" From 5e7d108befdb1038b8bd40566601e4e7f6461360 Mon Sep 17 00:00:00 2001 From: Mario Rial Date: Wed, 21 Sep 2016 21:43:13 +0000 Subject: [PATCH 5/5] code climate errors fix --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 64d81bf..2bb4337 100755 --- a/generate.sh +++ b/generate.sh @@ -54,7 +54,7 @@ for filename in $input/*.txt; do fi fi - i=$(($i+1)) + i=$((i+1)) done < "$filename"