cessna 0.0.1 → 0.0.2

data/lib/cessna.rb

@@ -12,6 +12,12 @@ module Cessna
     
     enable :sessions
     
+    helpers do
+      def format_is_supported?(video_name)
+        video_name.end_with?('.mp4') || video_name.end_with?('.m4v') || video_name.end_with?('.mov') 
+      end
+    end
+    
     before /^(\/browse*)|(\/play*)/ do
       check_session
     end
@@ -40,8 +46,8 @@ module Cessna
     
     get '/browse/:folder_location' do
       location = Base64.decode64(params[:folder_location])
-      @parent_location = location.split('/')[0..-2].join('/')
-      @current_folder = location.split('/').last
+      @parent_location = parent_location(location)
+      @current_folder = item_name(location)
       
       items = fetch_items(location)
       @folders = collect_folders(items)
@@ -61,8 +67,8 @@ module Cessna
     get '/play/:video_location' do
       location  = Base64.decode64(params[:video_location])
       client = airvideo_client
-      @parent_location = location.split('/')[0..-2].join('/')
-      @video_name = location.split('/').last
+      @parent_location = parent_location(location)
+      @video_name = item_name(location)
       
       client.cd(@parent_location)
       video = client.ls.select{|item| item.name == @video_name}.first      
@@ -90,11 +96,28 @@ module Cessna
     end
     
     def collect_folders(items)
-      items.select{|item| item.is_a? AirVideo::Client::FolderObject}
+      items.select{ |item| item.is_a?(AirVideo::Client::FolderObject) }
     end
     
     def collect_videos(items)
-      items.select{|item| item.is_a? AirVideo::Client::VideoObject}
+      items.select{ |item| item.is_a?(AirVideo::Client::VideoObject) }
+    end
+    
+    def parent_location(location)
+      # The path of a Windows AirVideo Server uses \\ as a path seperator...
+      if location.include?('\\')
+        location.split('\\')[0..-2].join('\\')
+      else
+        location.split('/')[0..-2].join('/')
+      end
+    end
+    
+    def item_name(location)
+      if location.include?('\\')
+        location.split('\\').last
+      else
+        location.split('/').last
+      end
     end
   end
 end

data/lib/cessna/version.rb

@@ -1,3 +1,3 @@
 module Cessna
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/views/play.haml

@@ -9,9 +9,9 @@
 %h4
   ="Playing: #{@video_name}"
 
-- if @video_name.end_with?('.mkv')
+- unless format_is_supported?(@video_name)
   %div{class: 'alert alert-info'}
-    ="The playback of the MKV format ist not really supported by HTML5 video and therefore the playback is disabled."
+    ="The playback of this video format ist not really supported by HTML5 video and therefore the playback is disabled."
 - else
   %div
     %video{ width: 640, controls: true, autoplay: true, class: 'img-polaroid'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cessna
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: