modsvaskr 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b83c21e7648319219295b25181279f2894007f5659f3696940131ebe796c20
-  data.tar.gz: f819b5e39f3a8e03bd92ad9cebe86974fda83f933039a18a9f26b6fb60477b84
+  metadata.gz: 3b3bda4db035df3b3289829342c1a70a47be0191de49f35e72c2e25f6e8aaada
+  data.tar.gz: bed82e160e1310241b870e8545a08913b81caf210f5388121afd1fc465ad01c1
 SHA512:
-  metadata.gz: 9dad72598bceb4171c1c3162f9c4ebb7844dba123f7a5ecf774904023f9325568fd83a5948624dd2648eeb97ea54b5620e2f4697be36211810dcc47ca48470d9
-  data.tar.gz: cf2122bd6486967918e5956d68aec907ad76baf74d629b3f2b7620437898c083ad4eb0225681cfeeb8857090e56f51d7a6a34ff988b6cbb13dda925a9e6de570
+  metadata.gz: 35e165ef5571a0a54c47393aea22ec848e42be1d6d27940f8a23e24fba00b35da00677049b474d1370ba7b4fadf4de9088089ec8cb582ceb8c2c1de489490cf5
+  data.tar.gz: '08ade008d6263b3bef50df32efeda147e409e2f9c7644177ccaa03c112a9aafdb4f54e3102eb98b56814e6fbe42210d72df176d7e4feb0cb2341f3117faf72aa'

data/bin/modsvaskr

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-# require 'mod_organizer'
+require 'English'
 require 'modsvaskr/config'
 require 'modsvaskr/ui'
 
 begin
   Modsvaskr::Ui.new(config: Modsvaskr::Config.new('./modsvaskr.yaml')).run
 rescue
+  puts "An exception has occurred: #{$ERROR_INFO}\n#{$ERROR_INFO.backtrace.join("\n")}"
   puts 'Press Enter to exit.'
   $stdin.gets
 end

data/lib/modsvaskr/config.rb

@@ -1,3 +1,4 @@
+require 'mod_organizer'
 require 'yaml'
 require 'modsvaskr/game'
 require 'modsvaskr/xedit'
@@ -73,6 +74,19 @@ module Modsvaskr
       @config['no_prompt'] || false
     end
 
+    # Return the ModOrganizer instance, if configured.
+    #
+    # Result::
+    # * ModOrganizer or nil: The ModOrganizer instance, or nil if none
+    def mod_organizer
+      return nil unless @config['mod_organizer']
+
+      ModOrganizer.new(
+        @config['mod_organizer']['installation_dir'],
+        instance_name: @config['mod_organizer']['instance_name']
+      )
+    end
+
   end
 
 end

data/lib/modsvaskr/ui.rb

@@ -1,5 +1,6 @@
 require 'English'
 require 'curses_menu'
+require 'launchy'
 require 'modsvaskr/logger'
 require 'modsvaskr/tests_runner'
 require 'modsvaskr/run_cmd'
@@ -20,8 +21,12 @@ module Modsvaskr
     def initialize(config:)
       log "Launch Modsvaskr UI v#{Modsvaskr::VERSION} - Logs in #{Logger.log_file}"
       @config = config
+      @mod_organizer = @config.mod_organizer
     end
 
+    # Time that should be before any file time of mods (used for sorting)
+    TIME_BEGIN = Time.parse('2000-01-01')
+
     # Run the UI
     def run
       last_modsvaskr_version = nil
@@ -203,6 +208,102 @@ module Modsvaskr
             end
           end
         end
+        unless @mod_organizer.nil?
+          main_menu.item 'Mods Organizer' do
+            CursesMenu.new(
+              'Modsvaskr - Stronghold of Mods > Mods Organizer',
+              key_presses:
+            ) do |mo_menu|
+              # Show status
+              mo_menu.item 'Run Mod Organizer' do
+                @mod_organizer.run
+              end
+              mo_menu.item "#{@mod_organizer.mod_names.size} mods (#{@mod_organizer.mod_names.select { |mod_name| @mod_organizer.mod(name: mod_name).enabled? }.size} enabled)" do
+                CursesMenu.new(
+                  'Modsvaskr - Stronghold of Mods > Mods Organizer > Mods',
+                  key_presses:
+                ) do |mods_menu|
+                  mod_names = @mod_organizer.mods_list
+                  idx_size = (mod_names.size - 1).to_s.size
+                  mod_names.each.with_index do |mod_name, idx|
+                    mod = @mod_organizer.mod(name: mod_name)
+                    # need_update = false
+                    mods_menu.item(
+                      proc do
+                        sections = {
+                          enabled_cell: {
+                            text: mod.enabled? ? 'X' : ' ',
+                            begin_with: '[',
+                            end_with: ']',
+                            fixed_size: 3
+                          },
+                          idx_cell: {
+                            text: idx.to_s,
+                            fixed_size: idx_size
+                          },
+                          name_cell: {
+                            text: mod_name,
+                            color_pair: CursesMenu::COLORS_GREEN,
+                            fixed_size: 64
+                          },
+                          categories_cell: {
+                            text: mod.categories.map { |category| "[#{category}]" }.join(' '),
+                            fixed_size: 16
+                          },
+                          esps_cell: {
+                            text: "#{mod.plugins.size} plugins",
+                            fixed_size: 10
+                          }
+                        }
+                        mod.sources.sort_by { |source| source.download.nil? ? TIME_BEGIN : source.download.downloaded_date }.each.with_index do |source, src_idx|
+                          source_name = src_idx.zero? ? '' : '+ '
+                          source_name <<
+                            case source.type
+                            when :nexus_mods
+                              "Nexus Mod #{source.nexus_mod_id}/" +
+                                if source.download&.nexus_file_name
+                                  source.download&.nexus_file_name
+                                elsif source.file_name
+                                  source.file_name
+                                else
+                                  '<Unknown file>'
+                                end
+                            when :unknown
+                              source.file_name || '<Unknown source>'
+                            else
+                              raise "Unknown source type: #{source.type} for #{mod.name}"
+                            end
+                          sections["source_#{src_idx}".to_sym] = {
+                            text: source_name,
+                            color_pair: CursesMenu::COLORS_WHITE
+                          }
+                        end
+                        CursesMenu::CursesRow.new(sections)
+                      end,
+                      actions: proc do
+                        actions = {}
+                        # TODO: Use downloads' URL instead of mod's URL as it is very often more accurate
+                        if mod.url
+                          actions['v'] = {
+                            name: 'Visit',
+                            execute: proc { Launchy.open(mod.url) }
+                          }
+                        end
+                        actions
+                      end
+                    )
+                  end
+                  mods_menu.item 'Back' do
+                    :menu_exit
+                  end
+                end
+              end
+              mo_menu.item 'Back' do
+                :menu_exit
+              end
+            end
+          end
+        end
         main_menu.item 'See logs' do
           CursesMenu.new(
             'Modsvaskr - Stronghold of Mods > Logs',

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: elder_scrolls_plugin
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: mod_organizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.41'
+        version: '1.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.41'
+        version: '1.47'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '2.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '2.18'
 description: Command-line UI handling a full Mods' ecosystem for Bethesda's games.
 email:
 - muriel@x-aeon.com