Merge pull request #40 from /issues/39-Add_python_path_images_into_ra…

…ke_task Add python path images into rake task
RaspberryPiFoundation · Mar 29, 2022 · 6fe6848 · 6fe6848
2 parents 4d04401 + bb1b8fe
commit 6fe6848
Show file tree

Hide file tree

Showing 37 changed files with 59 additions and 5 deletions.
diff --git a/lib/tasks/project_components/dont-collide-starter/astronaut1.png b/lib/tasks/project_components/dont-collide-starter/astronaut1.png
diff --git a/lib/tasks/project_components/dont-collide-starter/astronaut2.png b/lib/tasks/project_components/dont-collide-starter/astronaut2.png
diff --git a/lib/tasks/project_components/dont-collide-starter/earth.png b/lib/tasks/project_components/dont-collide-starter/earth.png
diff --git a/lib/tasks/project_components/dont-collide-starter/flowers.png b/lib/tasks/project_components/dont-collide-starter/flowers.png
diff --git a/lib/tasks/project_components/dont-collide-starter/iss.png b/lib/tasks/project_components/dont-collide-starter/iss.png
diff --git a/lib/tasks/project_components/dont-collide-starter/moon.png b/lib/tasks/project_components/dont-collide-starter/moon.png
diff --git a/lib/tasks/project_components/dont-collide-starter/planet1.png b/lib/tasks/project_components/dont-collide-starter/planet1.png
diff --git a/lib/tasks/project_components/dont-collide-starter/planet2.png b/lib/tasks/project_components/dont-collide-starter/planet2.png
diff --git a/lib/tasks/project_components/dont-collide-starter/project_config.yml b/lib/tasks/project_components/dont-collide-starter/project_config.yml
@@ -6,3 +6,18 @@ COMPONENTS:
     location: "main.py"
     index: 0
     default: true
+IMAGES:
+  - "astronaut1.png"
+  - "astronaut2.png"
+  - "earth.png"
+  - "flowers.png"
+  - "iss.png"
+  - "moon.png"
+  - "planet1.png"
+  - "planet2.png"
+  - "rocket1.png"
+  - "rocket2.png"
+  - "shark.png"
+  - "tree.png"
+  - "treefeller.png"
+  - "turtle.png"
diff --git a/lib/tasks/project_components/dont-collide-starter/rocket1.png b/lib/tasks/project_components/dont-collide-starter/rocket1.png
diff --git a/lib/tasks/project_components/dont-collide-starter/rocket2.png b/lib/tasks/project_components/dont-collide-starter/rocket2.png
diff --git a/lib/tasks/project_components/dont-collide-starter/shark.png b/lib/tasks/project_components/dont-collide-starter/shark.png
diff --git a/lib/tasks/project_components/dont-collide-starter/tree.png b/lib/tasks/project_components/dont-collide-starter/tree.png
diff --git a/lib/tasks/project_components/dont-collide-starter/treefeller.png b/lib/tasks/project_components/dont-collide-starter/treefeller.png
diff --git a/lib/tasks/project_components/dont-collide-starter/turtle.png b/lib/tasks/project_components/dont-collide-starter/turtle.png
diff --git a/lib/tasks/project_components/dont_collide_clean_car_example/car.png b/lib/tasks/project_components/dont_collide_clean_car_example/car.png
diff --git a/lib/tasks/project_components/dont_collide_clean_car_example/project_config.yml b/lib/tasks/project_components/dont_collide_clean_car_example/project_config.yml
@@ -6,3 +6,5 @@ COMPONENTS:
     location: "main.py"
     index: 0
     default: true
+IMAGES:
+  - "car.png"
diff --git a/lib/tasks/project_components/dont_collide_dodge_asteroids_example/moon.png b/lib/tasks/project_components/dont_collide_dodge_asteroids_example/moon.png
diff --git a/lib/tasks/project_components/dont_collide_dodge_asteroids_example/project_config.yml b/lib/tasks/project_components/dont_collide_dodge_asteroids_example/project_config.yml
@@ -6,3 +6,6 @@ COMPONENTS:
     location: "main.py"
     index: 0
     default: true
+IMAGES:
+  - "moon.png"
+  - "rocket.png"
diff --git a/lib/tasks/project_components/dont_collide_dodge_asteroids_example/rocket.png b/lib/tasks/project_components/dont_collide_dodge_asteroids_example/rocket.png
diff --git a/lib/tasks/project_components/dont_collide_dont_pop_example/main.py b/lib/tasks/project_components/dont_collide_dont_pop_example/main.py
@@ -53,9 +53,9 @@ def draw_player():
 
 def setup():
   # Setup your animation here
+  size(400, 400)
   text_size(40)
   text_align(CENTER, TOP) # position around the centre, top
-  size(400, 400)
 
 
 def draw():

diff --git a/lib/tasks/project_components/dont_collide_skiing_cat_example/fallenover.png b/lib/tasks/project_components/dont_collide_skiing_cat_example/fallenover.png
diff --git a/lib/tasks/project_components/dont_collide_skiing_cat_example/project_config.yml b/lib/tasks/project_components/dont_collide_skiing_cat_example/project_config.yml
@@ -6,3 +6,6 @@ COMPONENTS:
     location: "main.py"
     index: 0
     default: true
+IMAGES:
+  - "fallenover.png"
+  - "skiing.png"
diff --git a/lib/tasks/project_components/dont_collide_skiing_cat_example/skiing.png b/lib/tasks/project_components/dont_collide_skiing_cat_example/skiing.png
diff --git a/lib/tasks/project_components/rocket_launch_example/moon.png b/lib/tasks/project_components/rocket_launch_example/moon.png
diff --git a/lib/tasks/project_components/rocket_launch_example/orange_planet.png b/lib/tasks/project_components/rocket_launch_example/orange_planet.png
diff --git a/lib/tasks/project_components/rocket_launch_example/planet.png b/lib/tasks/project_components/rocket_launch_example/planet.png
diff --git a/lib/tasks/project_components/rocket_launch_example/project_config.yml b/lib/tasks/project_components/rocket_launch_example/project_config.yml
@@ -6,3 +6,9 @@ COMPONENTS:
     location: "main.py"
     index: 0
     default: true
+IMAGES:
+  - "moon.png"
+  - "orange_planet.png"
+  - "planet.png"
+  - "purple_planet.png"
+  - "rocket.png" 
diff --git a/lib/tasks/project_components/rocket_launch_example/purple_planet.png b/lib/tasks/project_components/rocket_launch_example/purple_planet.png
diff --git a/lib/tasks/project_components/rocket_launch_example/rocket.png b/lib/tasks/project_components/rocket_launch_example/rocket.png
diff --git a/lib/tasks/project_components/rocket_launch_starter/moon.png b/lib/tasks/project_components/rocket_launch_starter/moon.png
diff --git a/lib/tasks/project_components/rocket_launch_starter/orange_planet.png b/lib/tasks/project_components/rocket_launch_starter/orange_planet.png
diff --git a/lib/tasks/project_components/rocket_launch_starter/planet.png b/lib/tasks/project_components/rocket_launch_starter/planet.png
diff --git a/lib/tasks/project_components/rocket_launch_starter/project_config.yml b/lib/tasks/project_components/rocket_launch_starter/project_config.yml
@@ -6,3 +6,9 @@ COMPONENTS:
     location: "main.py"
     index: 0
     default: true
+IMAGES:
+  - "moon.png"
+  - "orange_planet.png"
+  - "planet.png"
+  - "purple_planet.png"
+  - "rocket.png"
diff --git a/lib/tasks/project_components/rocket_launch_starter/purple_planet.png b/lib/tasks/project_components/rocket_launch_starter/purple_planet.png
diff --git a/lib/tasks/project_components/rocket_launch_starter/rocket.png b/lib/tasks/project_components/rocket_launch_starter/rocket.png
diff --git a/lib/tasks/projects.rake b/lib/tasks/projects.rake
@@ -7,8 +7,7 @@ namespace :projects do
   task create_starter: :environment do
     Dir.each_child("#{File.dirname(__FILE__)}/project_components") do |dir|
       proj_config = YAML.safe_load(File.read("#{File.dirname(__FILE__)}/project_components/#{dir}/project_config.yml"))
-      Project.find_by(identifier: proj_config['IDENTIFIER'])&.destroy
-      new_project = Project.new(identifier: proj_config['IDENTIFIER'], name: proj_config['NAME'])
+      project = find_project(proj_config)
       components = proj_config['COMPONENTS']
       components.each do |component|
         name = component['name']
@@ -18,9 +17,29 @@ namespace :projects do
         default = component['default']
         project_component = Component.new(name: name, extension: extension, content: code, index: index,
                                           default: default)
-        new_project.components << project_component
+        project.components << project_component
       end
-      new_project.save
+
+      project_images = proj_config['IMAGES'] || []
+      project_images.each do |image_name|
+        project.images.attach(io: File.open(File.dirname(__FILE__) + "/project_components/#{dir}/#{image_name}"),
+                              filename: image_name)
+      end
+
+      project.save
     end
   end
 end
+
+def find_project(proj_config)
+  if Project.find_by(identifier: proj_config['IDENTIFIER']).nil?
+    project = Project.new(identifier: proj_config['IDENTIFIER'], name: proj_config['NAME'])
+  else
+    project = Project.find_by(identifier: proj_config['IDENTIFIER'])
+    project.name = proj_config['NAME']
+    project.components.each(&:destroy)
+    project.images.purge
+  end
+
+  project
+end