enklawa 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNmODg4YTMyY2QxYWE5ZDcyMmZiNjU1MzBkM2ViOTVkYzQyMDczYg==
+    NjU0N2YyZjE0ZTM0NDA3Yjg4MjVjNGE1YzE3MjJlYTM0MjVmY2IzZA==
   data.tar.gz: !binary |-
-    ODA2ZTM0ZjljMzY3YTcwNWQyMGJhZWM2NjUxOTY1Yjc5YjhjZDFjYQ==
+    YTUyZWE4YzU1MWRlN2U2ODBlZDkzYTA2OWIzZGFmMTZhMjdmMzE1Mw==
 SHA512:
   metadata.gz: !binary |-
-    MWI2MWYzZGQ2ZGNlZjg4NzViZTEyNjA0YjUyODBmMjAyYTkzM2ZkZTMwOTY5
-    YTIwMDNhZDI0NjI5YWMwYTYzOGI4MGY3ODg2NzkyNDQ4MDRkMTJmNWRhMjBl
-    YzA2ZjUzMThjNmM0MmY0Y2E1Y2JiNDUzY2U5NThhYjFlNmNiYzE=
+    NWU4YmFkNGVmYmM0YmI1Mjg3NmY1OTg3MGQ5NTU5ZGFiOGY3ZmNlYjliMGFi
+    Mzg1YTg5NGMwNTkzODk3NWY5NWEyNDEwODFjMGFhZjdkZWZiMzg4Y2QyNTk5
+    MGJhN2NiNWFhMzI0NWZiYTc0OTdiMjdiNDY4YTI5YmI3Zjc3YzU=
   data.tar.gz: !binary |-
-    Zjk2ZWZiMTU4MTU3N2ZhYzEyYzFlNjk4NWUzNTViYzI0ZjlmN2Q2MzdkZGYx
-    MjZlYzhkYTk0NzI5NjFmYzEwNzE0NDhlMzUwMzU2MDE1MDc1NTAyZmY5MDc4
-    MGUwMjAwODc2MDNhNjY4NmViMTNkYzEwYjNkNDgxY2I2ZjllMWE=
+    MzUzNGM3OWQxM2JhNzIwNGViNjE2ZDU2NmEyOGE0ZDU1ODgyNzY2YTAzMGQ1
+    NDczMzIzYmNiNDMwZTdjZDhjMzU1MDBlODYzOTc1NzI5MDQyNDBjMzNjM2M2
+    ZTkwY2U5OTBjYTU3ZjlkNTUzMGRiZmE4YTU1ZDNlM2YwOWUwYWQ=

data/lib/enklawa/api/episode.rb

@@ -5,18 +5,6 @@ module Enklawa
   module Api
     class Episode < Struct.new(:id, :name, :description, :mp3, :pub_date, :link, :duration, :image)
 
-      def check_if_image_exists_or_use_from_program(program)
-        self.image = "http://www.enklawa.net/images/episodes/#{id}.jpg"
-
-        uri = URI(image)
-
-        request  = Net::HTTP.new uri.host
-        response = request.request_head uri.path
-        unless response.code.to_i == 200
-          self.image = program.image
-        end
-      end
-
       def to_h
         {
           id: id.to_i,

data/lib/enklawa/api/request.rb

@@ -1,14 +1,19 @@
 require "feedjira"
 require "sanitize"
-
+require "yaml"
 module Enklawa
   module Api
     class Request
-      INFO_XML_URL   = "http://www.enklawa.net/info.xml"
-      MAIN_PAGE_URL  = "http://enklawa.net"
-      FORUM_FEED_URL = "http://forum.enklawa.net/feed.php"
+      INFO_XML_URL       = "http://www.enklawa.net/info.xml"
+      MAIN_PAGE_URL      = "http://enklawa.net"
+      FORUM_FEED_URL     = "http://forum.enklawa.net/feed.php"
+      ENKLAWA_CACHE_FILE = '/tmp/enklawa_cache.yml'
       def initialize
-
+        @cache = YAML::load_file(ENKLAWA_CACHE_FILE) if File.exists?(ENKLAWA_CACHE_FILE)
+        @cache ||= {
+          'images' => {},
+          'durations' => {}
+        }
       end
 
       def get!
@@ -19,6 +24,8 @@ module Enklawa
         get_programs!
         get_episodes!
 
+        File.open(ENKLAWA_CACHE_FILE, 'w') {|f| f.write @cache.to_yaml }
+
         @response
       end
 
@@ -87,6 +94,37 @@ module Enklawa
         end
       end
 
+      def check_if_image_exists_or_use_from_program(program, episode)
+        return @cache['images'][episode.id] if @cache['images'].key?(episode.id)
+        image = "http://www.enklawa.net/images/episodes/#{episode.id}.jpg"
+
+        uri = URI(image)
+
+        request  = Net::HTTP.new uri.host
+        response = request.request_head uri.path
+        unless response.code.to_i == 200
+          image = program.image
+        end
+
+        @cache['images'][episode.id] = image
+
+        return image
+      end
+
+      def get_duration(episode)
+        return @cache['durations'][episode.id] if @cache['durations'].key?(episode.id)
+        
+        duration = nil
+        temp_output_file_name = "/tmp/episode_metadata.txt"
+        `ffmpeg2theora #{episode.mp3} > #{temp_output_file_name} 2>&1`
+        if open(temp_output_file_name).read.match(/.+Duration:\s+(\d{2}):(\d{2}):(\d{2}).+/i)
+          duration = ($3.to_i * 1000) + ($2.to_i * 60 * 1000) + ($1.to_i * 3600 * 1000)
+          @cache['durations'][episode.id] = duration
+        end
+
+        return duration
+      end
+
       def build_episode_from_entry(entry, program)
         episode             = Episode.new
         episode.id          = entry.id
@@ -100,8 +138,8 @@ module Enklawa
           temp_output_file_name = "/tmp/episode_metadata_#{episode.id}.txt"
           `ffmpeg2theora #{episode.mp3} > #{temp_output_file_name} 2>&1` unless File.exists?(temp_output_file_name)
           if open(temp_output_file_name).read.match(/.+Duration:\s+(\d{2}):(\d{2}):(\d{2}).+/i)
-            episode.duration    = ($3.to_i * 1000) + ($2.to_i * 60 * 1000) + ($1.to_i * 3600 * 1000)
-            episode.check_if_image_exists_or_use_from_program(program)
+            episode.duration    =
+            episode.image       = check_if_image_exists_or_use_from_program(program, episode)
             program << episode
           end
         end

data/lib/enklawa/api/response.rb

@@ -29,6 +29,7 @@ module Enklawa
         {
           version: VERSION,
           skype: skype,
+          build: Time.now.to_s,
           phone: phone,
           radio: radio,
           forum: @threads.map(&:to_h),

data/lib/enklawa/api/version.rb

@@ -1,5 +1,5 @@
 module Enklawa
   module Api
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enklawa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Arkadiusz Buras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json