appscreens-io-uploader 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6648cfd40417f57c27639cc88ae424ac0478caaf
-  data.tar.gz: d3df647dfc9e8227c30758bf0bb6a7421c88cfa2
+  metadata.gz: 871943afdeb92212ec7879149080090439f09c6e
+  data.tar.gz: f6715820cb485f28f07d33cd7f84b051ce5caee8
 SHA512:
-  metadata.gz: ea88c1b1126fa1e9d37674db8b70eb23b9d1b21fdec862ddcb7bd98a23f4e478ed27263ad5b692e20a9f016e422cbe2688f3872ba6ab4248d9287aec52a6f496
-  data.tar.gz: 1a6fa989b23edeb3481cbb4b10495d99804d9c45a30127af4819cdffbf33972125a7a244f58d6ab6befc8787db7075e89a112c7997bdbc663ca82176ff5c5392
+  metadata.gz: a85eb662b0786f3a3d17500c8ca9c49ed1bfb67a2afffd801d21f4d09b838837f12251f986f57b136f3df1e6629093817c815e48e6b10ba041bd8ea397eb7218
+  data.tar.gz: 7bb0b8a42c8901897c02e441024e03fd221a7e859dd9607b010e8c15f647d640ea20872bfba18423f8a18da97f36b38b9a744f348bc91ff5ad7bb851dbdb27fa

data/lib/appscreensIoUploader/runner.rb

@@ -8,9 +8,8 @@ module AppscreensIoUploader
     def run(path, project_id, screensSize)
       screenshots = Dir.glob("#{path}/**/*.{png,PNG}")
 
-      screenshots_to_upload = Array.new
+      screenshots_to_upload = Hash.new
       prevHeight = 0
-      maxScreens = 5
 
       if (project_id.length != 10)
         Helper.log.error "No valid project_id '#{project_id}' must be exactly 10 chars (copy it from your appscreens.io/[project_id] URL)"
@@ -27,14 +26,17 @@ module AppscreensIoUploader
 
           begin
             screenshot = Screenshot.new(full_path)
-            if screensSize == screenshot.screen_size && screenshots_to_upload.count < maxScreens
+            if screensSize == screenshot.screen_size
               if !screenshot.is_portrait?
                 raise "appscreens.io only supports PORTRAIT Orientation for now".red
               end
               if !screenshot.is_supported_screen_size?
-                raise "appscreens.io only supports 4.7inch,5inch and 5.5inch screen sizes".red
+                raise "appscreens.io only supports 4inch, 4.7inch and 5.5inch screen sizes to upload".red
               end
-              screenshots_to_upload << screenshot
+              if screenshots_to_upload[screenshot.language].nil?
+                screenshots_to_upload[screenshot.language] = Array.new
+              end
+              screenshots_to_upload[screenshot.language] << screenshot
             end
           rescue => ex
             Helper.log.error ex
@@ -42,7 +44,7 @@ module AppscreensIoUploader
         end
 
         if screenshots_to_upload.count == 0
-          Helper.log.error "Could not find any screensshots that fit the spec, please check again".red
+          Helper.log.error "Could not find any screenshots that fit the spec, please check again".red
         else
           uploader = Uploader.new
           uploader.upload!(project_id, screenshots_to_upload)

data/lib/appscreensIoUploader/screenshot.rb

@@ -3,6 +3,7 @@ module AppscreensIoUploader
   class Screenshot
     attr_accessor :path # path to the screenshot
     attr_accessor :size # size in px array of 2 elements: height and width
+    attr_accessor :language # 2 letter language code parsed out of file name - if not found en is used
     attr_accessor :screen_size # deliver screen size type, is unique per device type, used in device_name
 
     # path: Path to screenshot
@@ -12,6 +13,14 @@ module AppscreensIoUploader
       @path = path
       @size = FastImage.size(path)
 
+      matched_language = /\/([a-zA-Z]{2})-/.match(path)
+      if matched_language
+        @language = matched_language.captures[0]
+      else
+        @language = 'en'
+        Helper.log.info "cannot find language in filename fallback to 'en' file: #{path}"
+      end
+
       @screen_size = Deliver::AppScreenshot.calculate_screen_size(path)
     end
 

data/lib/appscreensIoUploader/uploader.rb

@@ -2,6 +2,7 @@ module AppscreensIoUploader
 
   class Uploader
     def upload!(project_id, screenshots)
+
       base_uri = 'https://appscreens.io'
       api_base_uri = base_uri + '/api/v1'
       screens_uri = '/projects/' + project_id + '/screens'
@@ -10,27 +11,26 @@ module AppscreensIoUploader
       response = HTTParty.get(api_base_uri + screens_uri)
       if response.code == 200
         screens = JSON.parse(response.body)
-
-        # TODO add multilang support
-        if screens.count > 5
-          Helper.log.error "your appscreens.io projects seems to have more than one language - support for this will be shortly :) - sorry".red
-          return
-        end
-
-        screens.each_with_index do |screen, index|
-
-          screenshot_path = screenshots[index].path
-          Helper.log.info "uploading screenshot #{screenshot_path} screen nr: #{screen['order']} lang: #{screen['language']}"
-          # POST /projects/{project_id}/screens/{screen_id}/image
-          upload_response = HTTMultiParty.post(api_base_uri + screens_uri + '/' + screen['id'] + '/image', :query => {
-            :image => File.new(screenshot_path)
-          })
-          if response.code == 200
-            Helper.log.info "successfully uploaded screenshot #{screenshot_path}".green
-          else
-            Helper.log.error "error while uploading screenshot #{screenshot_path} #{upload_response.body}"
+        screenshots.each do |language, screenshots_per_language|
+          screenshots_per_language.each_with_index do |screenshot, index|
+            screens.each do |screen|
+              if screen['language'] == language && index == screen['order'].to_i
+                screenshot_path = screenshot.path
+                Helper.log.info "uploading screenshot #{screenshot_path} screen nr: #{(screen['order'].to_i+1)} lang: #{screen['language']}"
+                # POST /projects/{project_id}/screens/{screen_id}/image
+                upload_response = HTTMultiParty.post(api_base_uri + screens_uri + '/' + screen['id'] + '/image', :query => {
+                  :image => File.new(screenshot_path)
+                })
+                if response.code == 200
+                  Helper.log.info "successfully uploaded screenshot #{screenshot_path}".green
+                else
+                  Helper.log.error "error while uploading screenshot #{screenshot_path} #{upload_response.body}"
+                end
+              else
+
+              end
+            end
           end
-
         end
 
       else

data/lib/appscreensIoUploader/version.rb

@@ -1,3 +1,3 @@
 module AppscreensIoUploader
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appscreens-io-uploader
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Daniel Griesser
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>'
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>'
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.11'
 description: Upload your screenshots to https://appscreens.io
 email:
 - daniel.griesser.86@gmail.com