jekyll-fdroid 1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72286c732de382d651b8377c0083ed8faeb58cab5a865dd8e72978dd84e1a60
-  data.tar.gz: 57873902b7c8d5249f269293afc0b2d172db25c1371f37b70ec959f00192dfcc
+  metadata.gz: fdf022851950f00170f4826165c03341ded682c0d1af6b2d1e045afb13e20d6d
+  data.tar.gz: 24a734ec556f49bbabc12f048e5375d47285e29c3e93fda6ded4733fe1d7b6a3
 SHA512:
-  metadata.gz: 551e0cba8c4add0d485a7dec9e12d95107b6be1a38620a730e58fe9174b648a861aa054dac69e9e519058adb6dc010c89843958fed78f3ba581ce1ccad4991d6
-  data.tar.gz: '0098617770f3bd1f3bbeddfd0278a9dcdf2cf50f1cc2ed5c8c842051210f7ea36e2f8ad6d59112237b94724bf223b97036031cfb1d271bffd602261153545b87'
+  metadata.gz: cdd231bec8b9f2e2e3deec73485cf1e7d649b9e35659ceb0cc488c71520a247be4be4ce83400e978eb275bd4090b435201dcd768abc53b402eef063a79e034c5
+  data.tar.gz: 7d0d654997464ecc5f1e887b4385c29adfa21c4a7ffbb76162c0795377615846969ee3ab819e37fe6b75bd259ed8de607eb7818470be1f2802515a2299c76875

data/lib/fdroid/App.rb

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'loofah'
 require_relative './Package'
 
 module FDroid
@@ -44,8 +45,10 @@ module FDroid
       end
     end
 
+    # this must exist since all entries are sorted by name,
+    # it uses tildes since they sort last
     def name
-      field('name') || App.localized(@available_locales, @app['localized'], 'name')
+      field('name') || App.localized(@available_locales, @app['localized'], 'name') || '~missing name~'
     end
 
     def summary
@@ -90,7 +93,7 @@ module FDroid
         'flattrID' => field('flattrID'),
         'liberapayID' => field('liberapayID'),
         'categories' => field('categories'),
-        'anti_features' => field('anti_features'),
+        'anti_features' => field('antiFeatures'),
         'suggested_version_code' => suggested_version_code,
         'suggested_version_name' => @packages.detect { |p| p.version_code == suggested_version_code }&.version_name,
         'issue_tracker' => field('issueTracker'),
@@ -110,6 +113,9 @@ module FDroid
         'feature_graphic' => App.localized_graphic_path(@available_locales, @app['localized'], 'featureGraphic'),
         'phone_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'phoneScreenshots'),
         'seven_inch_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'sevenInchScreenshots'),
+        'ten_inch_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'tenInchScreenshots'),
+        'tv_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'tvScreenshots'),
+        'wear_screenshots' => App.localized_graphic_list_paths(@available_locales, @app['localized'], 'wearScreenshots'),
 
         'packages' => @packages.sort.reverse.map { |p| p.to_data },
 
@@ -239,7 +245,17 @@ module FDroid
     private
 
     def field(name)
-      @app.key?(name) ? @app[name] : nil
+      if @app.key?(name)
+        value = @app[name]
+        case value
+        when Fixnum then return value
+        when Float then return value
+        when Integer then return value
+        when Array then return value.map { |i| Loofah.scrub_fragment(i, :escape).to_html(:save_with => 0) }
+        else
+          return Loofah.scrub_fragment(value, :escape).to_html(:save_with => 0)
+        end
+      end
     end
   end
 end

data/lib/fdroid/IndexV1.rb

@@ -51,7 +51,13 @@ module FDroid
       Dir.mktmpdir do |dir|
         jar = File.join dir, 'index-v1.jar'
         open(jar, 'wb') do |file|
-          file.write(Net::HTTP.get(repo))
+          begin
+            file.write(Net::HTTP.get(repo))
+          rescue Net::OpenTimeout, Net::ReadTimeout => e
+            puts "Timeout (#{e}), retrying in 1 second..."
+            sleep(1)
+            retry
+          end
         end
 
         Zip::File.open(jar) do |zip_file|

data/lib/fdroid/Repo.rb

@@ -15,6 +15,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'loofah'
+require 'uri'
+
 module FDroid
   class Repo
     def initialize(repo)
@@ -22,23 +25,25 @@ module FDroid
     end
 
     def name
-      @repo['name']
+      Loofah.scrub_fragment(@repo['name'], :escape).to_s
     end
 
     def address
-      @repo['address']
+      url = @repo['address']
+      url =~ /\A#{URI::regexp}\z/ ? url : nil
     end
 
     def icon_url
-      "#{self.address}/icons/#{@repo['icon']}"
+      url = "#{self.address}/icons/#{@repo['icon']}"
+      url =~ /\A#{URI::regexp}\z/ ? url : nil
     end
 
     def description
-      @repo['description']
+      Loofah.scrub_fragment(@repo['description'], :escape).to_s
     end
 
     def timestamp
-      @repo['timestamp']
+      Integer(@repo['timestamp']) rescue nil
     end
 
     def date

data/lib/jekyll/FDroidFilters.rb

@@ -33,33 +33,34 @@ module Jekyll
     # Hash with relation between Android SDK Level and Android version
     # https://source.android.com/setup/build-numbers
     @@AndroidSdkLevelToVersionRelation = {
-      '1' => '1.0',
-      '2' => '1.1',
-      '3' => '1.5',
-      '4' => '1.6',
-      '5' => '2.0',
-      '6' => '2.0.1',
-      '7' => '2.1',
-      '8' => '2.2',
-      '9' => '2.3',
-      '10' => '2.3.3',
-      '11' => '3.0',
-      '12' => '3.1',
-      '13' => '3.2',
-      '14' => '4.0',
-      '15' => '4.0.3',
-      '16' => '4.1',
-      '17' => '4.2',
-      '18' => '4.3',
-      '19' => '4.4',
-      '20' => '4.4W',
-      '21' => '5.0',
-      '22' => '5.1',
-      '23' => '6.0',
-      '24' => '7.0',
-      '25' => '7.1',
-      '26' => '8.0',
-      '27' => '8.1',
+      1 => '1.0',
+      2 => '1.1',
+      3 => '1.5',
+      4 => '1.6',
+      5 => '2.0',
+      6 => '2.0.1',
+      7 => '2.1',
+      8 => '2.2',
+      9 => '2.3',
+      10 => '2.3.3',
+      11 => '3.0',
+      12 => '3.1',
+      13 => '3.2',
+      14 => '4.0',
+      15 => '4.0.3',
+      16 => '4.1',
+      17 => '4.2',
+      18 => '4.3',
+      19 => '4.4',
+      20 => '4.4W',
+      21 => '5.0',
+      22 => '5.1',
+      23 => '6.0',
+      24 => '7.0',
+      25 => '7.1',
+      26 => '8.0',
+      27 => '8.1',
+      28 => '9.0',
     }
 
     # Convert a file size to a human-readable String.

data/lib/lunr/LunrIndexer.rb

@@ -75,6 +75,7 @@ module Jekyll
         extras = [
           'assets/fdroid-search-autocomplete.js',
           'assets/fdroid-search-autocomplete-init.js',
+          'assets/register-listener.js',
           'bower_components/lunr.js/lunr.js',
           'bower_components/mustache.js/mustache.min.js',
           'bower_components/awesomplete/awesomplete.min.js',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-fdroid
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.1.4
 platform: ruby
 authors:
 - Nico Alt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-include-cache
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.5
+- !ruby/object:Gem::Dependency
+  name: loofah
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: F-Droid - Free and Open Source Android App Repository