diff --git a/Gemfile.lock b/Gemfile.lock index a3c3bf6..130f705 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM activerecord kaminari-core (= 1.1.1) kaminari-core (1.1.1) - libv8 (3.16.14.19-x86_64-darwin-17) + libv8 (3.16.14.19) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) diff --git a/app/controllers/pkgs_controller.rb b/app/controllers/pkgs_controller.rb index 1382b65..c29b44d 100644 --- a/app/controllers/pkgs_controller.rb +++ b/app/controllers/pkgs_controller.rb @@ -41,7 +41,7 @@ def create @plat.validate_pkg(pkg) pkg.save - redirect_to pkg_path pkg + redirect_to pkg_path(pkg) rescue => e redirect_to new_plat_pkg_path(@plat), :flash => { :error => e.message } end @@ -50,7 +50,7 @@ def destroy pkg = Pkg.find params[:id] authorize!(:destroy, pkg) pkg.destroy! - redirect_to app_plat_path pkg.app, pkg.plat + redirect_to app_plat_path(pkg.app, pkg.plat) end diff --git a/app/models/pkg.rb b/app/models/pkg.rb index fdd9b53..e34a402 100644 --- a/app/models/pkg.rb +++ b/app/models/pkg.rb @@ -75,7 +75,7 @@ def parser end def save_icon - if app_icon + if app_icon.end_with?(".png") self.icon.store!(File.new(app_icon)) self.save end diff --git a/lib/parsers/pkg_adapter/ipa.rb b/lib/parsers/pkg_adapter/ipa.rb index 280717f..bf08c37 100644 --- a/lib/parsers/pkg_adapter/ipa.rb +++ b/lib/parsers/pkg_adapter/ipa.rb @@ -21,7 +21,7 @@ def parse plist = zip_file.glob("Payload/*.app/Info.plist").first @plist = plist ? ConfigParser.plist(plist.get_input_stream.read) : {} - + # read icon name if @plist["CFBundleIcons"] app_icon_name = @plist["CFBundleIcons"]["CFBundlePrimaryIcon"]["CFBundleIconName"]