From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/models/PluginRegistry.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/gitblit/models/PluginRegistry.java b/src/main/java/com/gitblit/models/PluginRegistry.java
index 6d82b97..3f692bc 100644
--- a/src/main/java/com/gitblit/models/PluginRegistry.java
+++ b/src/main/java/com/gitblit/models/PluginRegistry.java
@@ -23,7 +23,7 @@
import org.parboiled.common.StringUtils;
-import ro.fortsoft.pf4j.PluginVersion;
+import ro.fortsoft.pf4j.Version;
/**
* Represents a list of plugin registrations.
@@ -62,7 +62,7 @@
}
public static enum InstallState {
- NOT_INSTALLED, INSTALLED, CAN_UPDATE, UNKNOWN
+ NOT_INSTALLED, INSTALLED, UPDATE_AVAILABLE, UNKNOWN
}
/**
@@ -80,8 +80,6 @@
public String projectUrl;
- public String currentRelease;
-
public transient String installedRelease;
public transient String registry;
@@ -93,19 +91,19 @@
this.releases = new ArrayList<PluginRelease>();
}
- public PluginRelease getCurrentRelease() {
+ public PluginRelease getCurrentRelease(Version system) {
PluginRelease current = null;
- if (!StringUtils.isEmpty(currentRelease)) {
- // find specified
- current = getRelease(currentRelease);
- }
+ Date date = new Date(0);
+ for (PluginRelease pv : releases) {
+ Version requires = Version.ZERO;
+ if (!StringUtils.isEmpty(pv.requires)) {
+ requires = Version.createVersion(pv.requires);
+ }
- if (current == null) {
- // find by date
- Date date = new Date(0);
- for (PluginRelease pv : releases) {
+ if (system.isZero() || system.atLeast(requires)) {
if (pv.date.after(date)) {
current = pv;
+ date = pv.date;
}
}
}
@@ -121,17 +119,21 @@
return null;
}
- public InstallState getInstallState() {
+ public InstallState getInstallState(Version system) {
if (StringUtils.isEmpty(installedRelease)) {
return InstallState.NOT_INSTALLED;
}
- PluginVersion ir = PluginVersion.createVersion(installedRelease);
- PluginVersion cr = PluginVersion.createVersion(currentRelease);
+ Version ir = Version.createVersion(installedRelease);
+ Version cr = Version.ZERO;
+ PluginRelease curr = getCurrentRelease(system);
+ if (curr != null) {
+ cr = Version.createVersion(curr.version);
+ }
switch (ir.compareTo(cr)) {
case -1:
return InstallState.UNKNOWN;
case 1:
- return InstallState.CAN_UPDATE;
+ return InstallState.UPDATE_AVAILABLE;
default:
return InstallState.INSTALLED;
}
@@ -143,7 +145,10 @@
}
}
- public static class PluginRelease implements Comparable<PluginRelease> {
+ public static class PluginRelease implements Serializable, Comparable<PluginRelease> {
+
+ private static final long serialVersionUID = 1L;
+
public String version;
public Date date;
public String requires;
@@ -151,7 +156,7 @@
@Override
public int compareTo(PluginRelease o) {
- return PluginVersion.createVersion(version).compareTo(PluginVersion.createVersion(o.version));
+ return Version.createVersion(version).compareTo(Version.createVersion(o.version));
}
}
}
--
Gitblit v1.9.1