Notice: In order to edit this ticket you need to be either: a Product Owner, The owner or the reporter of the ticket, or, in case of a Task not yet assigned, a team_member"

Task #4868 (closed)

Opened 8 years ago

Closed 8 years ago

Add UpgradeCheck specifically for importer-cli

Reported by: bwzloranger Owned by: jamoore
Priority: minor Milestone: OMERO-Beta4.3.1
Component: General Version: n.a.
Keywords: n.a. Cc: atarkowska, jamoore, cblackburn
Resources: n.a. Referenced By: n.a.
References: n.a. Remaining Time: 0.0d
Sprint: 2011-07-07 (1)

Description

Add UpgradeCheck for the cli client (using 'importer-cli') Requires client change + QA change (needs importer-cli added to names in qa).

Change History (18)

comment:1 Changed 8 years ago by bwzloranger

  • Cc atarkowska jmoore cneves-x added

comment:2 Changed 8 years ago by bwzloranger

  • Summary changed from Add !UpgradeCheck specifically for importer-cli to Add UpgradeCheck specifically for importer-cli

comment:3 Changed 8 years ago by bwzloranger

  • Cc cblackburn added; cneves-x removed

comment:4 Changed 8 years ago by cxallan

  • Sprint changed from 2011-04-07 (9) to 2011-04-21 (10)

Moved from sprint 2011-04-07 (9)

comment:5 Changed 8 years ago by bwzloranger

  • Status changed from new to accepted

comment:6 Changed 8 years ago by bwzloranger

Proposed changes to enable upgrade check in cli:

+++ b/components/tools/OmeroImporter/src/ome/formats/OMEROMetadataStoreClient.java
@@ -50,6 +50,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
@@ -77,6 +78,7 @@ import ome.formats.model.ReferenceProcessor;
 import ome.formats.model.ShapeProcessor;
 import ome.formats.model.TargetProcessor;
 import ome.formats.model.WellProcessor;
+import ome.system.UpgradeCheck;
 import ome.util.LSID;
 import ome.xml.model.enums.IlluminationType;
 import ome.xml.model.enums.NamingConvention;
@@ -340,6 +342,17 @@ public class OMEROMetadataStoreClient
        }
     
     /**
+     * Check online to see if this is the current version
+     */
+    public boolean isUpgradeRequired(String versionNumber) {
+        ResourceBundle bundle = ResourceBundle.getBundle("omero");
+        String url = bundle.getString("omero.upgrades.url");
+        UpgradeCheck check = new UpgradeCheck(url, versionNumber, "importer");
+        check.run();
+        return check.isUpgradeNeeded();
+    }
+    
+    /**
      * Initialize all services needed
      * 
      * @throws ServerError
diff --git a/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java b/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.ja
index 8d6e2f9..7cf7a74 100644
--- a/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
+++ b/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
@@ -86,6 +86,7 @@ public class CommandLineImporter {
                 usage(); // EXITS TODO this should check for a "quiet" flag
             }
             store = config.createStore();
+            store.isUpgradeRequired(config.getVersionNumber());
             reader.setMetadataOptions(
                     new DefaultMetadataOptions(MetadataLevel.ALL));
             library = new ImportLibrary(store, reader);
diff --git a/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java b/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
index 8ff51be..81a7846 100644
--- a/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
+++ b/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
@@ -206,7 +206,7 @@ public class LoginHandler implements IObservable, ActionListener, WindowListener
                             viewer.setVisible(true);
                         }
                         
-                        isUpgradeRequired();
+                        store.isUpgradeRequired(config.getVersionNumber());
                         viewer.getStatusBar().setProgress(false, 0, "");
                         viewer.appendToOutput("> Login Successful.\n");
                         viewer.getFileQueueHandler().enableImports(true);
@@ -288,17 +288,6 @@ public class LoginHandler implements IObservable, ActionListener, WindowListener
             }
         }.start();
     }
-
-    /**
-     * Check online to see if this is the current version
-     */
-    public boolean isUpgradeRequired() {
-        ResourceBundle bundle = ResourceBundle.getBundle("omero");
-        String url = bundle.getString("omero.upgrades.url");
-        UpgradeCheck check = new UpgradeCheck(url, config.getVersionNumber(), "importer");
-        check.run();
-        return check.isUpgradeNeeded();
-    }
     
     /**
      *  refresh login

comment:7 Changed 8 years ago by bwzloranger 

diff --git a/components/tools/OmeroImporter/src/ome/formats/OMEROMetadataStoreClient.java b/components/tools/OmeroImporter/src/ome/formats/OMEROMetadataStoreClient.java
index 9b13344..0d995be 100644
--- a/components/tools/OmeroImporter/src/ome/formats/OMEROMetadataStoreClient.java
+++ b/components/tools/OmeroImporter/src/ome/formats/OMEROMetadataStoreClient.java
@@ -50,6 +50,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
@@ -77,6 +78,7 @@ import ome.formats.model.ReferenceProcessor;
 import ome.formats.model.ShapeProcessor;
 import ome.formats.model.TargetProcessor;
 import ome.formats.model.WellProcessor;
+import ome.system.UpgradeCheck;
 import ome.util.LSID;
 import ome.xml.model.enums.IlluminationType;
 import ome.xml.model.enums.NamingConvention;
@@ -340,6 +342,17 @@ public class OMEROMetadataStoreClient
        }
     
     /**
+     * Check online to see if this is the current version
+     */
+    public boolean isUpgradeRequired(String versionNumber, String agent) {
+        ResourceBundle bundle = ResourceBundle.getBundle("omero");
+        String url = bundle.getString("omero.upgrades.url");
+        UpgradeCheck check = new UpgradeCheck(url, versionNumber, agent);
+        check.run();
+        return check.isUpgradeNeeded();
+    }
+    
+    /**
      * Initialize all services needed
      * 
      * @throws ServerError
diff --git a/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java b/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
index 8d6e2f9..41ba1fa 100644
--- a/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
+++ b/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
@@ -86,6 +86,7 @@ public class CommandLineImporter {
                 usage(); // EXITS TODO this should check for a "quiet" flag
             }
             store = config.createStore();
+            store.isUpgradeRequired(config.getVersionNumber(), "importer-cli");
             reader.setMetadataOptions(
                     new DefaultMetadataOptions(MetadataLevel.ALL));
             library = new ImportLibrary(store, reader);
diff --git a/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java b/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
index 8ff51be..bcdf649 100644
--- a/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
+++ b/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
@@ -206,7 +206,7 @@ public class LoginHandler implements IObservable, ActionListener, WindowListener
                             viewer.setVisible(true);
                         }
                         
-                        isUpgradeRequired();
+                        store.isUpgradeRequired(config.getVersionNumber(), "importer");
                         viewer.getStatusBar().setProgress(false, 0, "");
                         viewer.appendToOutput("> Login Successful.\n");
                         viewer.getFileQueueHandler().enableImports(true);
@@ -288,17 +288,6 @@ public class LoginHandler implements IObservable, ActionListener, WindowListener
             }
         }.start();
     }
-
-    /**
-     * Check online to see if this is the current version
-     */
-    public boolean isUpgradeRequired() {
-        ResourceBundle bundle = ResourceBundle.getBundle("omero");
-        String url = bundle.getString("omero.upgrades.url");
-        UpgradeCheck check = new UpgradeCheck(url, config.getVersionNumber(), "importer");
-        check.run();
-        return check.isUpgradeNeeded();
-    }
     
     /**
      *  refresh login

comment:8 Changed 8 years ago by bwzloranger

Addition needed:

  • import.config and/or command line options to disable the upgrade check for cli

comment:9 Changed 8 years ago by jburel

  • Sprint changed from 2011-04-21 (10) to 2011-05-05 (11)

Referencing ticket #4981 has changed sprint.

comment:10 Changed 8 years ago by bwzloranger

  • Owner bwzloranger deleted
  • Status changed from accepted to new

comment:11 Changed 8 years ago by bwzloranger

  • Owner set to bwzloranger

comment:12 Changed 8 years ago by jburel

  • Sprint changed from 2011-05-05 (11) to 2011-05-19 (12)

Referencing ticket #4981 has changed sprint.

comment:13 Changed 8 years ago by bwzloranger

I've updated the clients so a disableUpgradeCheck = true inside the import.config file will disable upgrade checks for both clients.

diff --git a/components/blitz/src/ome/formats/OMEROMetadataStoreClient.java b/components/blitz/src/ome/formats/OMEROMetadataStoreClient.java
index f7bfdfc..7a730ab 100644
--- a/components/blitz/src/ome/formats/OMEROMetadataStoreClient.java
+++ b/components/blitz/src/ome/formats/OMEROMetadataStoreClient.java
@@ -50,6 +50,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
@@ -77,6 +78,7 @@ import ome.formats.model.ReferenceProcessor;
 import ome.formats.model.ShapeProcessor;
 import ome.formats.model.TargetProcessor;
 import ome.formats.model.WellProcessor;
+import ome.system.UpgradeCheck;
 import ome.util.LSID;
 import ome.xml.model.enums.IlluminationType;
 import ome.xml.model.enums.NamingConvention;
@@ -349,6 +351,17 @@ public class OMEROMetadataStoreClient
     }
 
     /**
+     * Check online to see if this is the current version
+     */
+    public boolean isUpgradeRequired(String versionNumber, String client) {
+        ResourceBundle bundle = ResourceBundle.getBundle("omero");
+        String url = bundle.getString("omero.upgrades.url");
+        UpgradeCheck check = new UpgradeCheck(url, versionNumber, client);
+        check.run();
+        return check.isUpgradeNeeded();
+    }
+    
+    /**
      * Initialize all services needed
      *
      * @throws ServerError
diff --git a/components/blitz/src/ome/formats/importer/ImportConfig.java b/components/blitz/src/ome/formats/importer/ImportConfig.java
index dc2b573..3da11b5 100644
--- a/components/blitz/src/ome/formats/importer/ImportConfig.java
+++ b/components/blitz/src/ome/formats/importer/ImportConfig.java
@@ -333,6 +333,13 @@ public class ImportConfig {
     }
 
     /**
+     * @return ini application title
+     */
+    public boolean getStaticDisableUpgradeCheck() {
+        return ini.getStaticDisableUpgradeCheck();
+    }
+    
+    /**
      * @return ini getForceFileArchiveOn
      */
     public boolean getForceFileArchiveOn() {
diff --git a/components/blitz/src/ome/formats/importer/util/IniFileLoader.java b/components/blitz/src/ome/formats/importer/util/IniFileLoader.java
index 82443ce..5b4b1a0 100755
--- a/components/blitz/src/ome/formats/importer/util/IniFileLoader.java
+++ b/components/blitz/src/ome/formats/importer/util/IniFileLoader.java
@@ -169,6 +169,14 @@ public class IniFileLoader {
     /**
      * @return application title
      */
+    public boolean getStaticDisableUpgradeCheck()
+    {
+    	return staticPrefs.node("General").getBoolean("disableUpgradeCheck", false);
+    }
+    
+    /**
+     * @return application title
+     */
     public boolean getForceFileArchiveOn()
     {
     	return staticPrefs.node("UI").getBoolean("forceFileArchiveOn", false);
diff --git a/components/tools/OmeroImporter/config/importer.config b/components/tools/OmeroImporter/config/importer.config
index b5b4f44..ad2bfe6 100644
--- a/components/tools/OmeroImporter/config/importer.config
+++ b/components/tools/OmeroImporter/config/importer.config
@@ -3,6 +3,7 @@ appTitle = OMERO.importer
 appVersionNote =
 port = 4064
 appVersionNumber = Beta4.3.0-DEV
+disableUpgradeCheck = false
 
 [Uploader]
 TokenURL = http://qa.openmicroscopy.org.uk/qa/initial/
diff --git a/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java b/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
index 8d6e2f9..d84fbba 100644
--- a/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
+++ b/components/tools/OmeroImporter/src/ome/formats/importer/cli/CommandLineImporter.java
@@ -86,6 +86,8 @@ public class CommandLineImporter {
                 usage(); // EXITS TODO this should check for a "quiet" flag
             }
             store = config.createStore();
+            if (config.getStaticDisableUpgradeCheck() == false)
+            	store.isUpgradeRequired(config.getVersionNumber(), "importer-cli");
             reader.setMetadataOptions(
                     new DefaultMetadataOptions(MetadataLevel.ALL));
             library = new ImportLibrary(store, reader);
diff --git a/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java b/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
index 1b743f9..eae24b2 100644
--- a/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
+++ b/components/tools/OmeroImporter/src/ome/formats/importer/gui/LoginHandler.java
@@ -206,7 +206,8 @@ public class LoginHandler implements IObservable, ActionListener, WindowListener
                             viewer.setVisible(true);
                         }
                         
-                        isUpgradeRequired();
+                        if (config.getStaticDisableUpgradeCheck() == false)
+                        	store.isUpgradeRequired(config.getVersionNumber(), "importer");
                         viewer.getStatusBar().setProgress(false, 0, "");
                         viewer.appendToOutput("> Login Successful.\n");
                         viewer.getFileQueueHandler().enableImports(true);
@@ -288,17 +289,6 @@ public class LoginHandler implements IObservable, ActionListener, WindowListener
             }
         }.start();
     }
-
-    /**
-     * Check online to see if this is the current version
-     */
-    public boolean isUpgradeRequired() {
-        ResourceBundle bundle = ResourceBundle.getBundle("omero");
-        String url = bundle.getString("omero.upgrades.url");
-        UpgradeCheck check = new UpgradeCheck(url, config.getVersionNumber(), "importer");
-        check.run();
-        return check.isUpgradeNeeded();
-    }
     
     /**
      *  refresh login

comment:14 Changed 8 years ago by jburel

  • Sprint changed from 2011-05-19 (12) to 2011-06-02 (13)

Referencing ticket #4981 has changed sprint.

comment:15 Changed 8 years ago by jburel

  • Sprint changed from 2011-06-02 (13) to 2011-06-16 (14)

Referencing ticket #4981 has changed sprint.

comment:16 Changed 8 years ago by jmoore

  • Owner changed from bwzloranger to jmoore
  • Status changed from new to accepted

comment:17 Changed 8 years ago by jburel

  • Milestone changed from OMERO-Beta4.3 to OMERO-Beta4.3.1
  • Sprint changed from 2011-06-16 (14) to 2011-06-30 (1)

Referencing ticket #4981 has changed sprint.

comment:18 Changed 8 years ago by jmoore <josh@…>

  • Remaining Time changed from 0.5 to 0
  • Resolution set to fixed
  • Status changed from accepted to closed

(In [cd23e66c1fd905610104b016c8c679388a699eae/ome.git] on branch develop) Adding 'OMERO.dropbox' agent to UpgradeCheck (Fix #4868)

Note: See TracTickets for help on using tickets. You may also have a look at Agilo extensions to the ticket.

1.3.13-PRO © 2008-2011 Agilo Software all rights reserved (this page was served in: 0.82535 sec.)

© 2000-2014 University of Dundee & Open Microscopy Environment. Creative Commons Attribution 3.0 Unported License
OME source code is available under the GNU General public license or through commercial license from Glencoe Software

We're Hiring!