From 6e7f2dfdb72442e84d58ed660ad0bf7b12a7f129 Mon Sep 17 00:00:00 2001 From: kyg516 Date: Thu, 15 Sep 2016 15:05:40 +0900 Subject: [PATCH] Update --- app/controllers/volume_controller.rb | 34 +++++++- app/uploaders/avatar_uploader.rb | 1 - app/views/partials/_sidenav.html.erb | 111 --------------------------- app/views/volume/index.html.erb | 2 +- config/routes.rb | 2 +- 5 files changed, 32 insertions(+), 118 deletions(-) diff --git a/app/controllers/volume_controller.rb b/app/controllers/volume_controller.rb index 63b9313..211e717 100644 --- a/app/controllers/volume_controller.rb +++ b/app/controllers/volume_controller.rb @@ -24,6 +24,17 @@ class VolumeController < ApplicationController else String state = (df.include? volume['Volume Name'].delete(' ')) ? "mounted" : "unmounted" volume['Mount State'] = state + + if state.eql? "mounted" + s = df.split("\n") + s.each do |t| + if t.include? volume['Volume Name'].delete(' ') + mnt_point = t.split(" ")[5] + volume['Mount Point'] = mnt_point + end + end + end + @volumes << volume volume = Hash.new end @@ -48,10 +59,25 @@ class VolumeController < ApplicationController end def file_upload - file_name = params[:file] - uploader = AvatarUploader.new - uploader.store!(file_name) - redirect_to '/volume/info' + df = get_df + mnt_dir = String.new + mnt_dest = String.new + file = params[:file] + s = df.split("\n") + s.each do |t| + if t.include? params[:volume_name] + mnt_dir = t.split(" ")[5] + end + end + mnt_dest = mnt_dir + "/" + file.original_filename + + puts "upload start" + u = AvatarUploader.new + u.store_path(:dir) + u.store!(file) + puts "upload end" + + redirect_to '/volume/index' end def volume_mount diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index 95b79c4..7aaaf32 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -13,7 +13,6 @@ class AvatarUploader < CarrierWave::Uploader::Base # Override the directory where uploaded files will be stored. # This is a sensible default for uploaders that are meant to be mounted: def store_dir - "/home/ubuntu/workspace/app/uploaders" end # Provide a default URL as a default if there hasn't been a file uploaded: diff --git a/app/views/partials/_sidenav.html.erb b/app/views/partials/_sidenav.html.erb index 7eab2f1..66fdf27 100644 --- a/app/views/partials/_sidenav.html.erb +++ b/app/views/partials/_sidenav.html.erb @@ -32,131 +32,20 @@
  • Log - -
    • -
  • Peer -
    • diff --git a/app/views/volume/index.html.erb b/app/views/volume/index.html.erb index ae1a795..924df1e 100644 --- a/app/views/volume/index.html.erb +++ b/app/views/volume/index.html.erb @@ -185,7 +185,7 @@
    <% if t["Mount State"] == "mounted" %>

    Uploader Activated

    -
    +

    <% else %> diff --git a/config/routes.rb b/config/routes.rb index 8628d14..345f445 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,7 +18,7 @@ Rails.application.routes.draw do #Volume get 'volume/index' => 'volume#index' - post 'file_upload' => 'volume#file_upload' + post 'file_upload/:volume_name' => 'volume#file_upload' post 'volume/mount' => "volume#volume_mount" post 'volume/create' => "volume#volume_create" get 'volume/unmount/:volume_name' => "volume#volume_unmount"