summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjwansek <eddie.atten.ea29@gmail.com>2022-01-22 20:42:03 +0000
committerjwansek <eddie.atten.ea29@gmail.com>2022-01-22 20:42:03 +0000
commit3313a936debe04c733b3003858724de17cfcd7de (patch)
treedd354a53d9d982571bd4d959319b5cea717a57a2
parent4e218b3c10fe61f5bc9a83183bd584927e37b1ec (diff)
downloadSmarker-3313a936debe04c733b3003858724de17cfcd7de.tar.gz
Smarker-3313a936debe04c733b3003858724de17cfcd7de.zip
added automatically removing generated files
-rw-r--r--ExampleAssessments/CMP-4009B.yml3
-rw-r--r--mark.py17
-rw-r--r--pdLine.pngbin49362 -> 0 bytes
-rw-r--r--pdResult.txt10
4 files changed, 15 insertions, 15 deletions
diff --git a/ExampleAssessments/CMP-4009B.yml b/ExampleAssessments/CMP-4009B.yml
index 2e5c564..d0dd2b2 100644
--- a/ExampleAssessments/CMP-4009B.yml
+++ b/ExampleAssessments/CMP-4009B.yml
@@ -57,6 +57,9 @@ files:
- serviceDue(2)
- serviceAt(2)
- powerAt(2)
+produced_files:
+ - pdLine.png
+ - pdResult.txt
dependencies:
libraries:
- matplotlib
diff --git a/mark.py b/mark.py
index 2630be1..835ac03 100644
--- a/mark.py
+++ b/mark.py
@@ -27,15 +27,22 @@ class FileDependencies:
pass
def __exit__(self, type, value, traceback):
+ stuff_to_remove = []
try:
- for file_dep in self.assessment_struct["dependencies"]["files"]:
- if os.path.isfile(os.path.split(file_dep)[-1]):
- os.remove(os.path.split(file_dep)[-1])
- else:
- shutil.rmtree(os.path.split(file_dep)[-1])
+ stuff_to_remove += [os.path.split(f)[-1] for f in self.assessment_struct["dependencies"]["files"]]
+ except KeyError:
+ pass
+ try:
+ stuff_to_remove += self.assessment_struct["produced_files"]
except KeyError:
pass
+ for file_dep in stuff_to_remove:
+ if os.path.isfile(file_dep):
+ os.remove(file_dep)
+ else:
+ shutil.rmtree(file_dep)
+
def main(**kwargs):
student_no = os.path.splitext(os.path.split(args["submission"])[-1])[0]
diff --git a/pdLine.png b/pdLine.png
deleted file mode 100644
index bd88e40..0000000
--- a/pdLine.png
+++ /dev/null
Binary files differ
diff --git a/pdResult.txt b/pdResult.txt
deleted file mode 100644
index 2ad813e..0000000
--- a/pdResult.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-2021-03-19 15:10:21 50.40 7680.0 8856.0
-2012-07-03 12:12:12 60.20 9173.33 10578.0
-2005-12-08 23:30:00 100.05 11910.71 13292.36
-2025-08-29 05:33:00 45.00 6857.14 7907.14
-2031-02-15 16:53:00 20.00 666.67 857.14
-1999-04-14 04:24:00 65.00 9904.76 11421.43
-2045-07-09 20:44:00 56.00 8533.33 9840.0
-2024-11-01 09:05:00 32.00 3504.76 2811.43
-2008-02-21 13:19:00 75.45 11497.14 13257.64
-2014-06-05 14:10:00 80.09 12204.19 14072.96