MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Method to load latest versions of plugins in non-release channels

Browse Source
This commit is contained in:
Ivan Chirkov
2015-09-17 10:37:28 -04:00
parent 1e16282a3e
commit dfd3ee8daf
3 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
+2
View File
@@ -73,6 +73,8 @@ public abstract class ApplicationInfoEx extends ApplicationInfo {
public abstract String getPluginsListUrl();
public abstract String getChannelsListUrl();
public abstract String getPluginsDownloadUrl();
public abstract String getBuiltinPluginsUrl();
platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+12
View File
@@ -88,6 +88,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
private String myReleaseFeedbackUrl;
private String myPluginManagerUrl;
private String myPluginsListUrl;
private String myChannelsListUrl;
private String myPluginsDownloadUrl;
private String myBuiltinPluginsUrl;
private String myWhatsNewUrl;
@@ -162,6 +163,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
private static final String ATTRIBUTE_EAP_URL = "eap-url";
private static final String ELEMENT_PLUGINS = "plugins";
private static final String ATTRIBUTE_LIST_URL = "list-url";
private static final String ATTRIBUTE_CHANNEL_LIST_URL = "channel-list-url";
private static final String ATTRIBUTE_DOWNLOAD_URL = "download-url";
private static final String ATTRIBUTE_BUILTIN_URL = "builtin-url";
private static final String ATTRIBUTE_WEBHELP_URL = "webhelp-url";
@@ -414,6 +416,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
return myPluginsListUrl;
}
@Override
public String getChannelsListUrl() {
return myChannelsListUrl;
}
@Override
public String getPluginsDownloadUrl() {
return myPluginsDownloadUrl;
@@ -733,6 +740,9 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
String listUrl = pluginsElement.getAttributeValue(ATTRIBUTE_LIST_URL);
myPluginsListUrl = listUrl != null ? listUrl : myPluginManagerUrl + (closed ? "" : "/") + "plugins/list/";
String channelListUrl = pluginsElement.getAttributeValue(ATTRIBUTE_CHANNEL_LIST_URL);
myChannelsListUrl = channelListUrl != null ? channelListUrl : myPluginManagerUrl + (closed ? "" : "/") + "channels/list/";
String downloadUrl = pluginsElement.getAttributeValue(ATTRIBUTE_DOWNLOAD_URL);
myPluginsDownloadUrl = downloadUrl != null ? downloadUrl : myPluginManagerUrl + (closed ? "" : "/") + "pluginManager/";
@@ -743,12 +753,14 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern
else {
myPluginManagerUrl = DEFAULT_PLUGINS_HOST;
myPluginsListUrl = DEFAULT_PLUGINS_HOST + "/plugins/list/";
myChannelsListUrl = DEFAULT_PLUGINS_HOST + "/channels/list/";
myPluginsDownloadUrl = DEFAULT_PLUGINS_HOST + "/pluginManager/";
}
final String pluginsHost = System.getProperty("idea.plugins.host");
if (pluginsHost != null) {
myPluginsListUrl = myPluginsListUrl.replace(DEFAULT_PLUGINS_HOST, pluginsHost);
myChannelsListUrl = myChannelsListUrl.replace(DEFAULT_PLUGINS_HOST, pluginsHost);
myPluginsDownloadUrl = myPluginsDownloadUrl.replace(DEFAULT_PLUGINS_HOST, pluginsHost);
}
platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java
+67 -2
View File
@@ -23,18 +23,24 @@ import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.application.ex.ApplicationInfoEx;
import com.intellij.openapi.application.impl.ApplicationInfoImpl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.updateSettings.impl.UpdateSettings;
import com.intellij.openapi.util.BuildNumber;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.hash.LinkedHashMap;
import com.intellij.util.io.HttpRequests;
import com.intellij.util.io.RequestBuilder;
import com.intellij.util.io.URLUtil;
import org.apache.http.client.utils.URIBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.io.JsonReaderEx;
import org.jetbrains.io.JsonUtil;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -104,9 +110,66 @@ public class RepositoryHelper {
return loadPlugins(repositoryUrl, buildnumber, forceHttps, indicator);
}
@NotNull
public static List<IdeaPluginDescriptor> loadPlugins(@Nullable final String repositoryUrl,
@Nullable BuildNumber buildnumber,
boolean forceHttps,
@Nullable final ProgressIndicator indicator) throws IOException {
List<IdeaPluginDescriptor> plugins = loadPlugins(repositoryUrl, buildnumber, null, forceHttps, indicator);
Map<PluginId, List<Pair<String, IdeaPluginDescriptor>>> pluginsFromChannels = loadPluginsFromChannels(buildnumber, indicator);
return plugins;
}
@NotNull
public static Map<PluginId, List<Pair<String, IdeaPluginDescriptor>>> loadPluginsFromChannels(@Nullable BuildNumber buildnumber,
@Nullable final ProgressIndicator indicator)
throws IOException {
Map<PluginId, List<Pair<String, IdeaPluginDescriptor>>> result = new LinkedHashMap<PluginId, List<Pair<String, IdeaPluginDescriptor>>>();
String url;
try {
URIBuilder uriBuilder = new URIBuilder(ApplicationInfoImpl.getShadowInstance().getChannelsListUrl());
uriBuilder.addParameter("build",
(buildnumber != null ? buildnumber.asString() : ApplicationInfoImpl.getShadowInstance().getApiVersion()));
url = uriBuilder.build().toString();
}
catch (URISyntaxException e) {
throw new IOException(e);
}
boolean forceHttps = IdeaApplication.isLoaded() && UpdateSettings.getInstance().canUseSecureConnection();
List<String> channelList =
HttpRequests.request(url).forceHttps(forceHttps).connect(new HttpRequests.RequestProcessor<List<String>>() {
@Override
public List<String> process(@NotNull HttpRequests.Request request) throws IOException {
//{"channels":["alpha","eap","ideadev","nightly"]}
return (List<String>)JsonUtil.nextObject(new JsonReaderEx(request.getReader().readLine())).get("channels");
}
});
for (String channel : channelList) {
List<IdeaPluginDescriptor> channelPlugins = loadPlugins(null, buildnumber, channel, forceHttps, indicator);
for (IdeaPluginDescriptor plugin : channelPlugins) {
PluginId pluginId = plugin.getPluginId();
List<Pair<String, IdeaPluginDescriptor>> pluginChannelDescriptors = result.get(pluginId);
if (pluginChannelDescriptors == null) {
pluginChannelDescriptors = new SmartList<Pair<String, IdeaPluginDescriptor>>();
result.put(pluginId, pluginChannelDescriptors);
}
pluginChannelDescriptors.add(Pair.create(channel, plugin));
}
}
return result;
}
@NotNull
public static List<IdeaPluginDescriptor> loadPlugins(@Nullable String repositoryUrl,
@Nullable BuildNumber buildnumber,
@Nullable String channel,
boolean forceHttps,
@Nullable final ProgressIndicator indicator) throws IOException {
final String url;
@@ -117,7 +180,7 @@ public class RepositoryHelper {
URIBuilder uriBuilder;
if (repositoryUrl == null) {
uriBuilder = new URIBuilder(ApplicationInfoImpl.getShadowInstance().getPluginsListUrl());
pluginListFile = new File(PathManager.getPluginsPath(), PLUGIN_LIST_FILE);
pluginListFile = new File(PathManager.getPluginsPath(), channel == null ? PLUGIN_LIST_FILE : channel + "_" + PLUGIN_LIST_FILE);
if (pluginListFile.length() > 0) {
uriBuilder.addParameter("crc32", Files.hash(pluginListFile, Hashing.crc32()).toString());
}
@@ -128,7 +191,9 @@ public class RepositoryHelper {
}
if (!URLUtil.FILE_PROTOCOL.equals(uriBuilder.getScheme())) {
uriBuilder.addParameter("build", (buildnumber != null ? buildnumber.asString() : ApplicationInfoImpl.getShadowInstance().getApiVersion()));
uriBuilder.addParameter("build",
(buildnumber != null ? buildnumber.asString() : ApplicationInfoImpl.getShadowInstance().getApiVersion()));
if (channel != null) uriBuilder.addParameter("channel", channel);
}
host = uriBuilder.getHost();