From: Niki Roo <niki@nikiroo.be>
Date: Fri, 1 May 2020 11:29:33 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=4d9e85d00d491422eb436d05b5de5af0cb326cdb;hp=-c

Merge branch 'subtree'
---

4d9e85d00d491422eb436d05b5de5af0cb326cdb
diff --combined src/be/nikiroo/fanfix/library/CacheLibrary.java
index 92e4ae7,a3c3b5e..a3c3b5e
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@@ -67,6 -67,7 +67,7 @@@ public class CacheLibrary extends Basic
  			pg = new Progress();
  		}
  
+ 		List<MetaData> copy;
  		synchronized (metasLock) {
  			// We make sure that cached metas have precedence
  			if (metasMixed == null) {
@@@ -86,10 -87,12 +87,12 @@@
  					}
  				}
  			}
+ 
+ 			copy = new ArrayList<MetaData>(metasMixed);
  		}
  
  		pg.done();
- 		return new ArrayList<MetaData>(metasMixed);
+ 		return copy;
  	}
  
  	@Override
@@@ -404,9 -407,7 +407,7 @@@
  
  		MetaData meta = lib.imprt(url, pgImprt);
  		updateMetaCache(metasReal, meta);
- 		synchronized (metasLock) {
- 			metasMixed = null;
- 		}
+ 		metasMixed = null;
  
  		clearFromCache(meta.getLuid());
  
diff --combined src/be/nikiroo/fanfix/supported/E621.java
index 602cd36,c0125fb..c0125fb
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@@ -292,6 -292,22 +292,22 @@@ class E621 extends BasicSupport 
  					builder.append(" ").append(tab[i]);
  				}
  			}
+ 
+ 			if (builder.length() == 0) {
+ 				String url = "https://e621.net/" + getSource().getPath()
+ 						+ "?page=1";
+ 				Document page1 = DataUtil.load(Instance.getInstance().getCache()
+ 						.open(getSource(), this, false), "UTF-8",
+ 						url.toString());
+ 				for (Element el : page1.getElementsByClass("search-tag")) {
+ 					if (el.attr("itemprop").equals("author")) {
+ 						if (builder.length() > 0) {
+ 							builder.append(", ");
+ 						}
+ 						builder.append(el.text().trim());
+ 					}
+ 				}
+ 			}
  		}
  
  		return builder.toString();