obf 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb08a3e8bb4fa68e9e15ad947027c620d61289d
-  data.tar.gz: 7df6db4d7ab3f7d887f17ce16384730b4503c400
+  metadata.gz: 28978f7be3cb038907f145a7bc6b4a50959dfac9
+  data.tar.gz: 426f20f1507fd57be3691d1c6f8246b60eec0efd
 SHA512:
-  metadata.gz: 1e45782603c6b1b07b03627bafa42740e6e2a5cd9a89262187fdc5903128cbaaa59fc3eafaa6d4bd07fea4d6cf83f8f63586b2fc669305cd4d720b9486499b6d
-  data.tar.gz: b7ce1bcbd8c3cecf1f7ccc12222555422cf83d4349741fb87a2f1fb37bea82007ea758e408d236a16a400e9348f7d8e687f8bfc64ee59661f203bc8c0bc04964
+  metadata.gz: de82778618d0a6ed121009c83721b6ec206a2b4bf6f564118c78ce4ed7f3868fcd7bfe32110d04080ac383edebf215b72d554666ad2acf8d1ff88e01796e98c8
+  data.tar.gz: c17d33b14d1945752d828a89d826e6ed2b81c06e0d9453aa30309b4a4886a99d0b8c72b3be2fd636b677b1f15c5904b9014def9717729eb923a8c68d03553817

data/lib/obf.rb

@@ -14,6 +14,7 @@ module OBF
   require 'obf/utils'
   
   require 'obf/picto4me'
-  require 'obf/avaz'
+  require 'obf/avz'
+  require 'obf/sfy'
   require 'obf/unknown_file'
 end

data/lib/obf/{avaz.rb → avz.rb}

@@ -1,4 +1,4 @@
-module OBF::Avaz
+module OBF::Avz
   def self.to_external(avz_path)
     # load the contents, process them into an external hash
   end

data/lib/obf/external.rb

@@ -3,8 +3,8 @@ module OBF::External
     if hash['boards']
       old_hash = hash
       hash = old_hash['boards'][0]
-      hash['images'] = content['images'] || []
-      hash['sounds'] = content['sounds'] || []
+      hash['images'] = old_hash['images'] || []
+      hash['sounds'] = old_hash['sounds'] || []
       path_hash = nil
     end
     
@@ -51,7 +51,7 @@ module OBF::External
           'url' => original_button['load_board']['url'],
           'data_url' => original_button['load_board']['data_url']
         }
-        if path_hash && path_hash['included_boards'][original_button['load_board']['id']]
+        if path_hash && path_hash['included_boards'] && path_hash['included_boards'][original_button['load_board']['id']]
           button['load_board']['path'] = "board_#{original_button['load_board']['id']}.obf"
         end
       end
@@ -94,7 +94,7 @@ module OBF::External
         'content_type' => original_image['content_type']
       }
       if !path_hash
-        image['data'] = OBF::Utils.image_base64(image['url'])
+        image['data'] = OBF::Utils.image_base64(image['url']) if image['url']
       else
         if path_hash['images'] && path_hash['images'][image['id']]
           image['path'] = path_hash['images'][image['id']]['path']
@@ -307,10 +307,10 @@ module OBF::External
     dest_path
   end
   
-  def self.to_png(board, dest_path)
+  def self.to_png(board, dest_path, opts)
     tmp_path = OBF::Utils.temp_path("stash")
     OBF::Utils.as_progress_percent(0, 0.5) do
-      self.to_pdf(board, tmp_path)
+      self.to_pdf(board, tmp_path, opts)
     end
     OBF::Utils.as_progress_percent(0.5, 1.0) do
       OBF::PDF.to_png(tmp_path, dest_path)

data/lib/obf/sfy.rb

@@ -0,0 +1,150 @@
+module OBF::Sfy
+  def self.to_external(path)
+    boards = []
+    images = []
+    sounds = []
+    
+    plist = CFPropertyList::List.new(:file => path)
+    data = CFPropertyList.native_types(plist.value)
+    
+    top = data['$top']['root']
+    list = data['$objects'][top]
+    
+    items = {
+      'strings' => {},
+      'buttons' => []
+    }
+    board_ids = []
+    images = []
+    data['$objects'].each_with_index do |item, idx|
+      if item.is_a?(String)
+        items['strings'][idx] = item
+      elsif item.is_a?(Hash) && item['mScreen']
+        item['word'] = data['$objects'][item['wordKey']] if item['wordKey']
+        item['symbol'] = data['$objects'][item['imageName']] if item['imageName']
+        board_ids[item['mScreen']] = true
+        items['buttons'] << item
+      else
+#        puts item.to_json
+      end
+    end
+    
+    image_counter = 0
+    board_ids.each_with_index do |present, idx|
+      if present
+        name = "HOME" 
+        if idx > 0
+          if boards[0]
+            name = boards[0]['buttons'][idx - 1]['label']
+          else
+            name = "Screen #{idx}"
+          end
+        end
+        
+        raw_buttons = items['buttons'].select{|b| b['mScreen'] == idx }
+        buttons = []
+        rows = 0
+        columns = 0
+        raw_buttons.each do |b|
+          rows = [rows, b['mRow']].max
+          columns = [columns, b['mColumn']].max
+        end
+        rows += 1
+        columns += 1
+        grid = {
+          'rows' => rows,
+          'columns' => columns,
+          'order' => []
+        }
+        button_counter = 0
+        rows.times do |i|
+          grid['order'][i] = []
+          columns.times do |j|
+            grid['order'][i][j] = nil
+            raw_button = raw_buttons.detect{|b| b['mRow'] == i && b['mColumn'] == j }
+            colors = {
+              0 => 'rgb(255, 255, 255)',  # white
+              1 => 'rgb(255, 0, 0)',      # red
+              3 => 'rgb(255, 112, 156)',  # red pink
+              2 => 'rgb(255, 115, 222)',  # pinky purple
+              4 => 'rgb(250, 196, 140)',  # light red-orange
+              5 => 'rgb(255, 196, 87)',   # orange
+              6 => 'rgb(255, 234, 117)',  # yellow
+              7 => 'rgb(255, 241, 92)',   # yellowy
+              8 => 'rgb(252, 242, 134)',  # light yellow
+              9 => 'rgb(82, 209, 86)',    # dark green
+              10 => 'rgb(149, 189, 42)',  # navy green
+              11 => 'rgb(161, 245, 113)', # green
+              12 => 'rgb(196, 252, 141)', # pale green
+              13 => 'rgb(94, 207, 255)',  # strong blue
+              14 => 'rgb(148, 223, 255)', # happy blue
+              15 => 'rgb(176, 223, 255)', # bluey
+              16 => 'rgb(194, 241, 255)', # light blue
+              17 => 'rgb(118, 152, 199)', # dark purple
+              18 => 'rgb(208, 190, 232)', # light purple
+              19 => 'rgb(153, 79, 0)',    # brown
+              20 => 'rgb(0, 109, 235)',   # dark blue
+              21 => 'rgb(0, 0, 0)',       # black
+              22 => 'rgb(161, 161, 161)', # gray
+              23 => 'rgb(255, 108, 59)',  # dark orange
+            }
+            if raw_button
+              image_id = nil
+              if raw_button['symbol']
+                # TODO: what's the difference in name between provided symbols and user images?
+                if raw_button['symbol'].match(/-/)
+                  # probably a user-defined symbol
+                else
+                  images << {
+                    'id' => image_counter,
+                    'symbol' => {
+                      'set' => 'sfy',
+                      'name' => raw_button['symbol']
+                    }
+                  }
+                  image_id = image_counter
+                  image_counter += 1
+                end
+              end
+              button = {
+                'id' => button_counter,
+                'label' => raw_button['word'],
+                'background_color' => colors[raw_button['backgroundColorID']],
+                'image_id' => image_id,
+                'hidden' => !raw_button['isOpen'],
+                'ext_sfy_isLinked' => raw_button['isLinked'],
+                'ext_sfy_isProtected' => raw_button['isProtected'],
+                'ext_sfy_backgroundColorID' => raw_button['backgroundColorID']
+              }
+              if raw_button['customLabel'] && data['$objects'][raw_button['customLabel']] && data['$objects'][raw_button['customLabel']] != ""
+                button['vocalization'] = button['label']
+                button['label'] = data['$objects'][raw_button['customLabel']]
+              end
+              if idx == 0 && raw_button['isLinked'] && board_ids[button_counter + 1]
+                button['load_board'] = {
+                  'id' => (button_counter + 1).to_s
+                }
+              end
+              grid['order'][i][j] = button['id']
+              buttons << button
+            end
+            button_counter += 1
+          end
+        end
+        board = {
+          'id' => idx.to_s,
+          'name' => name,
+          'buttons' => buttons,
+          'grid' => grid,
+          'ext_sfy_screen' => idx
+        }
+        boards << board
+      end
+    end
+    return {
+      'boards' => boards,
+      'images' => images,
+      'sounds' => []
+    }
+  end
+end

data/lib/obf/unknown_file.rb

@@ -5,18 +5,29 @@ module OBF::UnknownFile
       OBF::OBF.to_external(path, {})
     elsif type == :obz
       OBF::OBZ.to_external(path, {})
-    elsif type == :avaz
-      OBF::Avaz.to_external(path)
+    elsif type == :avz
+      OBF::Avz.to_external(path)
     elsif type == :picto4me
       OBF::Picto4me.to_external(path)
+    elsif type == :sfy
+      OBF::Sfy.to_external(path)
     else
       raise "unrecognized file type"
     end
   end
   
+  def self.to_obf_or_obz(path, dest_path_no_extension)
+    ext = to_external(path)
+    if !ext['boards'] || (ext['boards'] && ext['boards'].length == 1)
+      OBF::External.to_obf(ext, dest_path_no_extension + ".obf", {})
+    else
+      OBF::External.to_obz(ext, dest_path_no_extension + ".obz", {})
+    end
+  end
+  
   def self.to_obf(path, dest_path)
     ext = to_external(path)
-    OBF::External.to_obf(ext, dest_path, {})
+    OBF::External.to_obf(ext, dest_path)
   end
   
   def self.to_obz(path, dest_path)

data/lib/obf/utils.rb

@@ -1,3 +1,4 @@
+require 'cfpropertylist'
 module OBF::Utils
   def self.get_url(url)
     return nil unless url
@@ -26,42 +27,55 @@ module OBF::Utils
     }
   end
   
-  def self.identify_file(file)
-    name = File.basename(file.path) rescue nil
+  def self.identify_file(path)
+    name = File.basename(path) rescue nil
     if name.match(/\.obf$/)
       return :obf
     elsif name.match(/\.obz$/)
       return :obz
     elsif name.match(/\.avz$/)
-      return :avaz
+      return :avz
     else
-      json = JSON.parse(file.read) rescue nil
+      json = JSON.parse(File.read(path)) rescue nil
       if json
         if json['format'] && json['format'].match(/^open-board-/)
           return :obf
         end
-      else
-        begin
-          type = nil
-          load_zip(f.path) do |zipper|
-            if zipper.exists?('manifest.json')
-              json = JSON.parse(zipper.read('manifest.json')) rescue nil
-              if json['root'] && json['format'] && json['format'].match(/^open-board-/)
-                type = :obz
-              end
+        return :unknown
+      end
+      
+      begin
+        plist = CFPropertyList::List.new(:file => path) rescue nil
+        plist_data = CFPropertyList.native_types(plist.value) rescue nil
+        if plist_data
+          if plist_data['$objects'] && plist_data['$objects'].any?{|o| o['$classname'] == 'SYWord' }
+            return :sfy
+          end
+          return :unknown
+        end
+      rescue CFFormatError => e
+      end
+      
+      begin
+        type = nil
+        load_zip(path) do |zipper|
+          if zipper.glob('manifest.json').length > 0
+            json = JSON.parse(zipper.read('manifest.json')) rescue nil
+            if json['root'] && json['format'] && json['format'].match(/^open-board-/)
+              type = :obz
             end
-            if !type && zipper.glob('*.js')
-              json = JSON.parse(zipper.read('*.js')) rescue nil
-              if json['locale'] && json['sheets']
-                type = :picto4me
-              end
+          end
+          if !type && zipper.glob('*.js').length > 0
+            json = JSON.parse(zipper.read('*.js')) rescue nil
+            if json['locale'] && json['sheets']
+              type = :picto4me
             end
           end
-          return type if type
+        end
+        return type if type
 #         rescue => e
 #           puts e.class.to_s
 #           puts e.message.to_s
-        end
       end
     end
     return :unknown
@@ -123,7 +137,8 @@ module OBF::Utils
     elsif image['raw_data']
       file.write image['raw_data']
     else
-      raise "uh-oh"
+      file.close
+      return nil
     end
     file.close
     `convert #{file.path} -density 1200 -resize 300x300 -background none -gravity center -extent 300x300 #{file.path}.png`
@@ -246,6 +261,10 @@ module OBF::Utils
       entry = @zipfile.glob(path).first
       entry ? entry.get_input_stream.read : nil
     end
+    
+    def glob(path)
+      @zipfile.glob(path)
+    end
 
     def read_as_data(path)
       attrs = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -118,13 +118,14 @@ files:
 - LICENSE
 - README.md
 - lib/obf.rb
-- lib/obf/avaz.rb
+- lib/obf/avz.rb
 - lib/obf/external.rb
 - lib/obf/obf.rb
 - lib/obf/obz.rb
 - lib/obf/pdf.rb
 - lib/obf/picto4me.rb
 - lib/obf/png.rb
+- lib/obf/sfy.rb
 - lib/obf/unknown_file.rb
 - lib/obf/utils.rb
 - lib/tinycolor_convert.js