Merge pull request #88 from Floppy/images

Add Images

app/controllers/images_controller.rb

@@ -0,0 +1,27 @@
+class ImagesController < ApplicationController
+  before_action :get_library
+  before_action :get_model
+  before_action :get_image
+
+  def show
+    respond_to do |format|
+      format.png { send_file File.join(@library.path, @model.path, @image.filename) }
+      format.jpeg { send_file File.join(@library.path, @model.path, @image.filename) }
+    end
+  end
+
+  private
+
+  def get_library
+    @library = Library.find(params[:library_id])
+  end
+
+  def get_model
+    @model = @library.models.find(params[:model_id])
+  end
+
+  def get_image
+    @image = @model.images.find(params[:id])
+    @title = @image.name
+  end
+end

app/jobs/model_scan_job.rb

@@ -2,6 +2,7 @@ class ModelScanJob < ApplicationJob
   queue_as :default
 
   FILE_PATTERN = "*.{stl,STL,obj,OBJ}"
+  IMAGE_FILE_PATTERN = "*.{jpg,JPG,png,PNG}"
 
   def perform(model)
     # For each file in the model, create a part
@@ -13,6 +14,12 @@ def perform(model)
       ]).each do |filename|
         model.parts.find_or_create_by(filename: filename.gsub(model_path + "/", ""))
       end
+      Dir.glob([
+        File.join(dir.path, IMAGE_FILE_PATTERN),
+        File.join(dir.path, "images", IMAGE_FILE_PATTERN)
+      ]).each do |filename|
+        model.images.find_or_create_by(filename: filename.gsub(model_path + "/", ""))
+      end
     end
     # Set tags and default parts
     model.parts.reload

app/models/image.rb

@@ -0,0 +1,14 @@
+class Image < ApplicationRecord
+  belongs_to :model
+  validates :filename, presence: true, uniqueness: {scope: :model}
+
+  default_scope { order(:filename) }
+
+  def file_format
+    File.extname(filename).delete(".").downcase
+  end
+
+  def name
+    File.basename(filename, ".*").humanize.titleize
+  end
+end

app/models/model.rb

@@ -2,6 +2,7 @@ class Model < ApplicationRecord
   belongs_to :library
   belongs_to :creator, optional: true
   has_many :parts, dependent: :destroy
+  has_many :images, dependent: :destroy
   belongs_to :preview_part, class_name: "Part", optional: true
   validates :name, presence: true
   validates :path, presence: true, uniqueness: {scope: :library}

app/views/models/_image.html.erb

@@ -0,0 +1,8 @@
+<div class="col mb-4">
+  <div class="card">
+    <%= image_tag library_model_image_path(@library, @model, image, format: image.file_format), class: "card-img-top", alt: image.name %>
+    <div class="card-body">
+      <h5 class="card-title"><%= image.name %></h5>
+    </div>
+  </div>
+</div>

app/views/models/show.html.erb

@@ -2,6 +2,7 @@
 <div class="row row-cols-2">
 
   <div class="col-9">
+    <h2>Parts</h2>
     <div class="row row-cols-2 row-cols-md-3 mb-4">
       <%= render partial: "part", collection: @groups.delete(nil) %>
     </div>
@@ -11,6 +12,10 @@
         <%= render partial: "part", collection: parts %>
       </div>
     <% end %>
+    <h2>Images</h2>
+    <div class="row row-cols-2 row-cols-md-3 mb-4">
+      <%= render partial: "image", collection: @model.images %>
+    </div>
   </div>
 
   <div class="col-3">

config/routes.rb

@@ -7,6 +7,7 @@
         patch "update", action: "bulk_update"
       end
       resources :parts, except: [:index, :destroy]
+      resources :images, only: [:show]
     end
   end
   resources :creators

db/migrate/20210321164508_create_images.rb

@@ -0,0 +1,9 @@
+class CreateImages < ActiveRecord::Migration[6.1]
+  def change
+    create_table :images do |t|
+      t.references :model, null: false, foreign_key: true
+      t.string :filename
+      t.timestamps
+    end
+  end
+end

spec/models/image_spec.rb

@@ -0,0 +1,5 @@
+require "rails_helper"
+
+RSpec.describe Image, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end