cessna 0.0.2 → 0.0.3

data/lib/cessna.rb

@@ -37,23 +37,32 @@ module Cessna
     end
     
     get '/browse' do
-      items = fetch_items('/')
-      @folders = collect_folders(items)
-      @videos = collect_videos(items)           
+      begin
+        items = fetch_items('/')
+        @folders = collect_folders(items)
+        @videos = collect_videos(items)          
       
-      haml :browse
+        haml :browse 
+      rescue RuntimeError
+        show_error('It was not possible to access the shared folders. Perhaps the content is protected?')
+      end
     end
     
     get '/browse/:folder_location' do
       location = Base64.decode64(params[:folder_location])
-      @parent_location = parent_location(location)
-      @current_folder = item_name(location)
       
-      items = fetch_items(location)
-      @folders = collect_folders(items)
-      @videos = collect_videos(items)   
+      begin
+        @parent_location = parent_location(location)
+        @current_folder = item_name(location)
+      
+        items = fetch_items(location)
+        @folders = collect_folders(items)
+        @videos = collect_videos(items)   
         
-      haml :browse
+        haml :browse
+      rescue RuntimeError => e
+        show_runtime_error(e)
+      end
     end
     
     post '/session' do
@@ -66,15 +75,20 @@ module Cessna
     
     get '/play/:video_location' do
       location  = Base64.decode64(params[:video_location])
-      client = airvideo_client
-      @parent_location = parent_location(location)
-      @video_name = item_name(location)
       
-      client.cd(@parent_location)
-      video = client.ls.select{|item| item.name == @video_name}.first      
-      @video_stream_url = video.url
+      begin
+        client = airvideo_client
+        @parent_location = parent_location(location)
+        @video_name = item_name(location)
+      
+        client.cd(@parent_location)
+        video = client.ls.select{|item| item.name == @video_name}.first      
+        @video_stream_url = video.url
                           
-      haml :play
+        haml :play
+      rescue RuntimeError => e
+        show_runtime_error(e)
+      end        
     end
     
     private
@@ -119,5 +133,21 @@ module Cessna
         location.split('/').last
       end
     end
+    
+    def show_runtime_error(exception)
+      show_error("AirVideo Runtime Error: #{exception}")
+    end
+    
+    def show_error(error_message)
+      clear_session
+      @error_message = error_message
+      haml :error
+    end
+    
+    def clear_session
+      session['hostname'] = nil
+      session['port'] = nil
+      session['password'] = nil
+    end
   end
 end

data/lib/cessna/version.rb

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

data/views/browse.haml

@@ -21,4 +21,4 @@
           ="#{video.name}"      
 - else          
   %div{class: 'alert alert-info'}
-    ="No folders or supported video formats were found in this folder..."
+    ="There are no folders or supported video formats in this folder..."

data/views/error.haml

@@ -0,0 +1,7 @@
+%div{class: 'alert alert-error'}
+  %p
+    %strong
+      ="Something went wrong!" 
+  =@error_message
+  
+%a{href: '/', class: 'btn'}="back"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cessna
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -82,6 +82,7 @@ files:
 - public/assets/img/glyphicons-halflings-white.png
 - public/assets/img/glyphicons-halflings.png
 - views/browse.haml
+- views/error.haml
 - views/index.haml
 - views/layout.haml
 - views/play.haml