Added --ide-path option and other optimizations (#12)

unurgunite · web-flow · commit e5827786e722 · 2025-11-13T14:39:18.000+03:00
- Added short flags
- Raise error if too many redirects
- Optimized build detection
- Removed info about `--brew` flag
diff --git a/jb_updater/src/jb_updater/cli.cr b/jb_updater/src/jb_updater/cli.cr
@@ -15,6 +15,7 @@ module JBUpdater
     property include_bundled : Bool
     property install_ids : Array(String)
     property product : String?
+    property ide_path : String?
     property brew_patch : Bool?
     property upgrade_ide : Bool
     property ide_downloads_host : String
@@ -35,6 +36,7 @@ module JBUpdater
       @upgrade_ide = false
       @ide_downloads_host = "download-cdn.jetbrains.com"
       @arch = nil
+      @ide_path = nil
     end
   end
 
@@ -44,17 +46,20 @@ module JBUpdater
     OptionParser.parse do |parser|
       parser.banner = "Usage: jb_updater [options]"
       parser.on("--plugins-dir DIR", "Plugins directory") { |v| opts.plugins_dir = v }
-      parser.on("--build BUILD", "IDE build") { |v| opts.build = v }
-      parser.on("--dry-run", "Dry run") { opts.dry_run = true }
-      parser.on("--list", "List plugins") { opts.list = true }
-      parser.on("--install-plugin IDS", "Install plugins (comma-separated)") { |v| opts.install_ids = v.split(',') }
+      parser.on("-b", "--build BUILD", "IDE build") { |v| opts.build = v }
+      parser.on("-d", "--dry-run", "Dry run") { opts.dry_run = true }
+      parser.on("-l", "--list", "List plugins") { opts.list = true }
+      parser.on("-i", "--install-plugin IDS", "Install plugins (comma-separated)") { |v| opts.install_ids = v.split(',') }
       parser.on("--product NAME", "IDE product name (e.g., RubyMine or RubyMine2025.2)") do |v|
         opts.product = v
       end
       parser.on("--arch ARCH", "Architecture (arm or intel); default: autodetect") do |v|
         opts.arch = v.downcase
       end
       parser.on("--upgrade-ide", "Upgrade whole IDE instead of plugins") { opts.upgrade_ide = true }
+      parser.on("--ide-path PATH", "Specify custom IDE installation path") do |v|
+        opts.ide_path = v
+      end
       parser.on("--brew", "Patch Homebrew cask Ruby file instead of direct install") { opts.brew_patch = nil }
       parser.on("-h", "--help", "Show help") do
         puts parser
diff --git a/jb_updater/src/jb_updater/http_client.cr b/jb_updater/src/jb_updater/http_client.cr
@@ -30,7 +30,8 @@ module JBUpdater
     # ----------------------------------------------------------------------
     # Download a file with redirect support and a simple progress bar
     # ----------------------------------------------------------------------
-    def self.download(uri : URI, dest_path : String) : Nil
+    def self.download(uri : URI, dest_path : String, depth = 0) : Nil
+      raise "Too many redirects: #{depth}" if depth > 5
       headers = HTTP::Headers{"User-Agent" => USER_AGENT}
       client = HTTP::Client.new(uri)
       client.before_request { |req| req.headers.merge!(headers) }
@@ -77,7 +78,7 @@ module JBUpdater
                   path: loc
                 )
               end
-              return download(next_uri, dest_path)
+              return download(next_uri, dest_path, depth + 1)
             else
               raise "redirect without Location header for #{uri}"
             end
diff --git a/jb_updater/src/jb_updater/updater.cr b/jb_updater/src/jb_updater/updater.cr
@@ -50,95 +50,102 @@ module JBUpdater
       end
     end
 
-    private def validate!
-      raise "plugins_dir required" unless @opts.plugins_dir
-      raise "Plugins dir not found: #{@opts.plugins_dir}" unless Dir.exists?(@opts.plugins_dir.not_nil!)
-    end
-
     private def detect_build_info : String?
+      base_name = File.basename(File.dirname(@opts.plugins_dir.not_nil!)).gsub(/\d.*$/, "")
+      info_json = ""
+      build_txt = ""
+
+      # Prefer explicit --ide-path
+      if custom = @opts.ide_path
+        {% if flag?(:darwin) %}
+          info_json, build_txt = ide_metadata_paths(:mac, custom)
+        {% elsif flag?(:linux) %}
+          info_json, build_txt = ide_metadata_paths(:linux, custom)
+        {% elsif flag?(:win32) %}
+          info_json, build_txt = ide_metadata_paths(:windows, custom)
+        {% else %}
+          raise "Unsupported platform"
+        {% end %}
+        if result = read_build_info(info_json, build_txt, File.basename(custom))
+          return result
+        end
+      end
+
+      candidates = [] of String
       {% if flag?(:darwin) %}
-        detect_build_info_macos
+        candidates = ["/Applications/#{base_name}.app"]
       {% elsif flag?(:linux) %}
-        detect_build_info_linux
+        candidates = ["/opt/#{base_name}", "/usr/share/#{base_name}", "/snap/#{base_name}/current"]
       {% elsif flag?(:win32) %}
-        detect_build_info_windows
+        roots = [
+          ENV["LOCALAPPDATA"]?,
+          ENV["PROGRAMFILES"]?,
+          ENV["PROGRAMFILES(X86)"]?,
+        ].compact
+        candidates = roots.map { |r| File.join(r, "JetBrains", base_name) }
       {% else %}
         raise "Unsupported platform"
       {% end %}
-    end
 
-    private def detect_build_info_macos : String?
-      base = File.basename(File.dirname(@opts.plugins_dir.not_nil!)).gsub(/\d.*$/, "")
-      app_path = "/Applications/#{base}.app"
-      info_json = File.join(app_path, "Contents", "Resources", "product-info.json")
-      build_txt = File.join(app_path, "Contents", "Resources", "build.txt")
-
-      if File.file?(info_json)
-        data = JSON.parse(File.read(info_json))
-
-        code =
-          data["productCode"]?.try(&.as_s?) ||
-            data["product"]?.try(&.[]("code")).try(&.as_s?)
-
-        build =
-          data["buildNumber"]?.try(&.as_s?) ||
-            data["build"]?.try(&.as_s?) ||
-            data["version"]?.try(&.as_s?)
-
-        return "#{code}-#{build}" if code && build
-      elsif File.file?(build_txt)
-        build = File.read(build_txt).strip
-        return "RM-#{build}" unless build.empty?
+      candidates.each do |root|
+        {% if flag?(:darwin) %}
+          info_json, build_txt = ide_metadata_paths(:mac, root)
+        {% elsif flag?(:linux) %}
+          info_json, build_txt = ide_metadata_paths(:linux, root)
+        {% elsif flag?(:win32) %}
+          info_json, build_txt = ide_metadata_paths(:windows, root)
+        {% end %}
+        if result = read_build_info(info_json, build_txt, base_name)
+          return result
+        end
       end
 
+      JBUpdater::Log.warn("Could not detect build for #{base_name}")
       nil
     end
 
-    private def detect_build_info_linux : String?
-      base = File.basename(File.dirname(@opts.plugins_dir.not_nil!)).gsub(/\d.*$/, "")
-      candidates = [
-        "/opt/#{base}",
-        "/usr/share/#{base}",
-        "/snap/#{base}/current",
-      ]
-
-      candidates.each do |root|
-        info = File.join(root, "bin", "product-info.json")
-        if File.file?(info)
-          data = JSON.parse(File.read(info))
-          code = data["productCode"]?.try(&.as_s?) || data["product"]?.try(&.[]("code")).try(&.as_s?)
-          build = data["buildNumber"]?.try(&.as_s?) || data["build"]?.try(&.as_s?) || data["version"]?.try(&.as_s?)
-          return "#{code}-#{build}" if code && build
-        end
+    private def ide_metadata_paths(platform, root : String) : {String, String}
+      case platform
+      when :mac
+        {
+          File.join(root, "Contents", "Resources", "product-info.json"),
+          File.join(root, "Contents", "Resources", "build.txt"),
+        }
+      else
+        {
+          File.join(root, "bin", "product-info.json"),
+          File.join(root, "build.txt"),
+        }
       end
-      nil
     end
 
-    private def detect_build_info_windows : String?
-      base = File.basename(File.dirname(@opts.plugins_dir.not_nil!)).sub(/\d.*$/, "")
-      roots = [
-        ENV["LOCALAPPDATA"]?,
-        ENV["PROGRAMFILES"]?,
-        ENV["PROGRAMFILES(X86)"]?,
-      ].compact
-
-      roots.each do |root|
-        path = File.join(root, "JetBrains", base)
-        info_json = File.join(path, "bin", "product-info.json")
-        build_txt = File.join(path, "build.txt")
-        if File.file?(info_json)
-          j = JSON.parse(File.read(info_json))
-          code = j["productCode"]?.try(&.as_s?)
-          build = j["buildNumber"]?.try(&.as_s?)
+    private def read_build_info(info_json : String, build_txt : String, base_name : String) : String?
+      if File.file?(info_json)
+        begin
+          data = JSON.parse(File.read(info_json))
+          code =
+            data["productCode"]?.try(&.as_s?) ||
+              data["product"]?.try(&.[]("code")).try(&.as_s?)
+          build =
+            data["buildNumber"]?.try(&.as_s?) ||
+              data["build"]?.try(&.as_s?) ||
+              data["version"]?.try(&.as_s?)
           return "#{code}-#{build}" if code && build
-        elsif File.file?(build_txt)
-          build = File.read(build_txt).strip
-          return "#{base}-#{build}" unless build.empty?
+        rescue ex
+          JBUpdater::Log.warn("Parse error in #{info_json}: #{ex.message}")
         end
+      elsif File.file?(build_txt)
+        build = File.read(build_txt).strip
+        return "#{base_name}-#{build}" unless build.empty?
       end
       nil
     end
 
+    private def validate!
+      raise "plugins_dir required" unless @opts.plugins_dir
+      raise "Plugins dir not found: #{@opts.plugins_dir}" unless Dir.exists?(@opts.plugins_dir.not_nil!)
+    end
+
     private def list_plugins : Nil
       plugins = installed_plugins
       if plugins.empty?
@@ -242,7 +249,6 @@ module JBUpdater
         HTTPClient.download(uri, tmp_zip)
         Utils.extract_zip(tmp_zip, target_dir)
 
-        # Re-parse plugin.xml in the freshly extracted directory
         if post = PluginMeta.parse_from_dir(target_dir)
           compat = Utils.build_in_range?(@build.not_nil!, post.since, post.until_build)
           suffix = compat ? "" : " (still incompatible)"
@@ -257,7 +263,6 @@ module JBUpdater
 
     # --- URL-resolution helpers ----------------------------------------------
 
-    # Determine the correct download URL for a given plugin id
     private def final_uri(xml_id : String) : URI
       if @opts.direct_urls.has_key?(xml_id)
         URI.parse(@opts.direct_urls[xml_id])
@@ -268,11 +273,9 @@ module JBUpdater
       end
     end
 
-    # Resolve URL for a specific pinned version
     private def resolve_download_url_for_version(xml_id : String, version : String) : URI
       base = "https://plugins.jetbrains.com/plugin/download?pluginId=#{Utils.escape(xml_id)}&version=#{Utils.escape(version)}"
       res = HTTPClient.head_or_get(base)
-
       case res.status_code
       when 301, 302
         loc = res.headers["Location"]?
@@ -286,11 +289,9 @@ module JBUpdater
       end
     end
 
-    # Resolve URL for the latest compatible version via pluginManager
     private def resolve_download_url_via_plugin_manager(xml_id : String, build : String) : URI
       base = "https://plugins.jetbrains.com/pluginManager?action=download&id=#{Utils.escape(xml_id)}&build=#{Utils.escape(build)}"
       res = HTTPClient.head_or_get(base)
-
       case res.status_code
       when 301, 302
         loc = res.headers["Location"]?
diff --git a/jb_updater/src/main.cr b/jb_updater/src/main.cr
@@ -38,5 +38,5 @@ if opts.plugins_dir
 end
 
 # If neither condition matched, print a brief help hint
-puts "Usage: jb_updater --plugins-dir <path> [options] or --product <IDE> [--brew]"
+puts "Usage: jb_updater --plugins-dir <path> [options] or --product <IDE>"
 exit 1
