From: Niki Roo <niki@nikiroo.be>
Date: Thu, 7 May 2020 20:29:31 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=0cf9d0459e5e67ef3f97c57cb5acb51fb5da97d7;hp=-c

Merge branch 'subtree'
---

0cf9d0459e5e67ef3f97c57cb5acb51fb5da97d7
diff --combined src/be/nikiroo/fanfix/Main.java
index 9d9592e,c0dd9e0..c0dd9e0
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@@ -28,6 -28,7 +28,7 @@@ import be.nikiroo.fanfix.supported.Basi
  import be.nikiroo.fanfix.supported.SupportType;
  import be.nikiroo.utils.Progress;
  import be.nikiroo.utils.Version;
+ import be.nikiroo.utils.VersionCheck;
  import be.nikiroo.utils.serial.server.ServerObject;
  
  /**
@@@ -397,8 -398,10 +398,10 @@@ public class Main 
  		if (exitCode == 0) {
  			switch (action) {
  			case IMPORT:
- 				if (updates != null)
- 					updates.ok(); // we consider it read
+ 				if (updates != null) {
+ 					// we consider it read
+ 					Instance.getInstance().setVersionChecked(); 
+ 				}
  				
  				try {
  					exitCode = imprt(BasicReader.getUrl(urlString), pg);
@@@ -409,8 -412,10 +412,10 @@@
  				
  				break;
  			case EXPORT:
- 				if (updates != null)
- 					updates.ok(); // we consider it read
+ 				if (updates != null) {
+ 					// we consider it read
+ 					Instance.getInstance().setVersionChecked(); 
+ 				}
  				
  				OutputType exportType = OutputType.valueOfNullOkUC(sourceString, null);
  				if (exportType == null) {
@@@ -423,8 -428,10 +428,10 @@@
  				
  				break;
  			case CONVERT:
- 				if (updates != null)
- 					updates.ok(); // we consider it read
+ 				if (updates != null) {
+ 					// we consider it read
+ 					Instance.getInstance().setVersionChecked(); 
+ 				}
  				
  				OutputType convertType = OutputType.valueOfAllOkUC(sourceString, null);
  				if (convertType == null) {
@@@ -599,8 -606,10 +606,10 @@@
  				exitCode = 0;
  				break;
  			case VERSION:
- 				if (updates != null)
- 					updates.ok(); // we consider it read
+ 				if (updates != null) {
+ 					// we consider it read
+ 					Instance.getInstance().setVersionChecked(); 
+ 				}
  				
  				System.out
  						.println(String.format("Fanfix version %s"
@@@ -716,12 -725,17 +725,17 @@@
  	 * @return the newer version information or NULL if nothing new
  	 */
  	protected VersionCheck checkUpdates(String githubProject) {
- 		VersionCheck updates = VersionCheck.check(githubProject);
- 		if (updates.isNewVersionAvailable()) {
- 			notifyUpdates(updates);
- 			return updates;
+ 		try {
+ 			VersionCheck updates = VersionCheck.check(githubProject,
+ 					Instance.getInstance().getTrans().getLocale());
+ 			if (updates.isNewVersionAvailable()) {
+ 				notifyUpdates(updates);
+ 				return updates;
+ 			}
+ 		} catch (IOException e) {
+ 			// Maybe no internet. Do not report any update.
  		}
- 		
+ 
  		return null;
  	}
  
@@@ -730,9 -744,9 +744,9 @@@
  	 * <p>
  	 * Will only be called when a version is available.
  	 * <p>
- 	 * Note that you can call {@link VersionCheck#ok()} on it if the user has
- 	 * read the information (by default, it is marked read only on certain other
- 	 * actions).
+ 	 * Note that you can call {@link Instance#setVersionChecked()} on it if the
+ 	 * user has read the information (by default, it is marked read only on
+ 	 * certain other actions).
  	 * 
  	 * @param updates
  	 *            the new version information