fly_admin 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04a96b71887cfc1d39a76501710f129f0d13ccef
-  data.tar.gz: 1d43ec3a9d1ad992fdcd36af89edb6daa07dd568
+  metadata.gz: 6087dde9982958faca55e330427a4db02fb5c4a2
+  data.tar.gz: 9a3cd30838ae399583702e3470cf573f13f9759a
 SHA512:
-  metadata.gz: c9a69f55da46dcd568f96dbea5e4969c7d596d830c2bd95f56c8cf66fd88954442f0f32b84dbada2fa7f73c889686197e7f5b6f8e2ad20206ccdfb7ed282f7d0
-  data.tar.gz: a8884e6b81f41b983251cc52aee2e1c0398e475846eac2fc603d6f0a4dffe02c5481bb282617ca3317076e9f9bb8265c78e4701f3f58954df92eca0b20f54988
+  metadata.gz: f45ac706a680e256f300808057deac09043666571606e4246ea2a3350f5279032dcd8e5b1a3d390ffb878795b623f0096b2393b8116db47ca826172b4b45fe95
+  data.tar.gz: 1bbe129e34de2041cc162a84fe1a67f83796fc28d774e8bec39f7b1684b0f2188b1a9edf40e69f7a1dd5a18002df1b5b6b4b38fecc46117e83a1ef54602fdedc

data/app/controllers/fly_admin/videos_controller.rb

@@ -76,7 +76,7 @@ module FlyAdmin
         @seasons = @category.seasons.each {|s| s.json_title = JSON.parse(s.title)["ru"]}
 
         # needed for videos list
-        @videos = @season.videos
+        @videos = @season.videos.order(created_at: :desc)
 
       end
 
@@ -84,4 +84,4 @@ module FlyAdmin
         params["after_upload"].present?
       end
   end
-end
+end

data/app/jobs/fly_admin/convert_video_job.rb

@@ -24,7 +24,6 @@ module FlyAdmin
 
       folders.each do |node|
         node_path = node["li_attr"]["url"]
-        node_name = node["name"]
         files = Dir["#{path + node_path.shellescape}/**/*.{mp4,mp3,aaf,3gp,gif,asf,avchd,avi,cam,dat,dsh,flv,mpeg,mpeg-1,mpeg-2,fla,flr,sol,m4v,mkv,wrap,mng,mov,mpg,mpe,mxf,nsv,ogg,svi,smi,wmv}"]
         files.each do |file|
           file_path = file.split(path).last # remove root from path
@@ -48,7 +47,7 @@ module FlyAdmin
       title, file_path, season_id = video[:title], video[:file_path], video[:season_id]
       filename = file_path.split("/").last.gsub(/[^0-9A-Za-z.\-]/, '_')
 
-      v = Video.create!(:title => title, :content => filename, :state => Video::BEFORE_SPAWNLING, :source_path => file_path)
+      v = Video.create!(:title => title, :content => filename, :state => Video::BEFORE_SPAWNLING, :source_path => file_path, :uuid => SecureRandom.uuid)
       dir = File.dirname(v.content_path)
       FileUtils.mkdir_p(dir)
 

data/app/models/fly_admin/concerns/convertable.rb

@@ -11,8 +11,6 @@ module FlyAdmin
       CONVERTATION_LOG.info "video_#{self.id}: start processing"
       
       begin
-        movie = FFMPEG::Movie.new(self.full_source_path)
-
         create_dir(self.high_content_path)
         create_dir(self.low_content_path)
 
@@ -39,7 +37,6 @@ module FlyAdmin
       log_file = "#{Rails.root}/log/ffmpeg_convertation.log"
       pid_file = "#{Rails.root}/tmp/pids/ffmpeg_pids.pid"
       cmd = "ffmpeg -i #{full_source_path.shellescape} #{options} -threads 0 -y #{self.path + outfile}"# >> #{logfile} 2>&1"
-      success_convert = 0
       fork do
         Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
           CONVERTATION_LOG.info "video_#{id} #{FORMAT[mask]} started"
@@ -96,15 +93,15 @@ module FlyAdmin
     end
 
     def path
-      Rails.root.to_s + "/public/uploads/video/content/#{self.id}/"
+      "#{Rails.root}/public/uploads/video/content/#{self.uuid}/"
     end
 
     def content_path
-      Rails.root.to_s + "/public/uploads/video/content/#{self.id}/#{self.content}"
+      path + self.content
     end
 
     def url 
-      "/uploads/video/content/#{self.id}/"
+      path.split("/public").last
     end
 
     def low_content_url

data/app/models/fly_admin/concerns/screenshotable.rb

@@ -3,26 +3,25 @@ module FlyAdmin
     extend ::ActiveSupport::Concern
     module ClassMethods
     end
-    # needed in categories/_video_desc.html.haml
+    # needed in videos#show
     def picture_url
-       "/uploads/video/picture/#{self.id}/screenshot.jpg"
+       "/uploads/video/picture/#{self.uuid}/screenshot.jpg"
     end
 
     def create_thumbnail
       movie = FFMPEG::Movie.new(self.full_source_path)
-      screenshot_path = "public/uploads/video/picture/#{self.id}/screenshot.jpg"
-      dir = create_dir screenshot_path
+      screenshot_path = "public/uploads/video/picture/#{self.uuid}/screenshot.jpg"
+      create_dir screenshot_path
 
       seek_time = self.thumb_time.present? ? self.thumb_time : (movie.duration / 2).to_s
+      self.thumb_time = seek_time
 
       system("ffmpeg -ss #{seek_time} -y -i #{self.full_source_path.shellescape} -vframes 1 -f image2 #{screenshot_path}")
 
-      self.thumb_time = seek_time
-      self.picture = screenshot_path
     end
 
     def remove_picture
-      FileUtils.rm_rf(Rails.root.to_s + "/public/uploads/video/picture/#{self.id}/")
+      FileUtils.rm(Rails.root.to_s + "/public" + picture_url)
     end
 
   end

data/app/views/fly_admin/videos/index.html.haml

@@ -40,7 +40,8 @@
             - @videos.each do |video|
               %tr
                 %td
-                  = video.id
+                  = link_to main_app.category_season_video_path(@category.try(:id), video.season_id, video.id) do
+                    = video.id
                 %td
                   = video_title(video.title)
                 %td

data/db/migrate/20150514114816_add_uuid_to_video.rb

@@ -0,0 +1,5 @@
+class AddUuidToVideo < ActiveRecord::Migration
+  def change
+    add_column :videos, :uuid, :string
+  end
+end

data/lib/fly_admin/version.rb

@@ -1,3 +1,3 @@
 module FlyAdmin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fly_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ruslan Korolev
@@ -965,6 +965,7 @@ files:
 - db/migrate/20150417142656_create_fly_admin_paysites.rb
 - db/migrate/20150417142744_create_fly_admin_countries.rb
 - db/migrate/20150428102104_add_source_type_to_fly_admin_footers.rb
+- db/migrate/20150514114816_add_uuid_to_video.rb
 - lib/fly_admin.rb
 - lib/fly_admin/connection_api.rb
 - lib/fly_admin/engine.rb