BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 09:12:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

search rework

Browse Source
This commit is contained in:
bancika
2016-10-24 17:56:13 +02:00
parent b529adefcb
commit be334165ba
11 changed files with 731 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/plugins/cloud/model/ServiceAPI.java → diylc/diylc-core/src/org/diylc/plugins/cloud/model/IServiceAPI.java
+2 -2
View File
@@ -6,12 +6,12 @@ import java.util.List;
import com.diyfever.httpproxy.ParamName;
/***
* Interface of DIYLC PHP server located at www.diy-fever.com/diylc/api
* Interface of DIYLC PHP server located at www.diy-fever.com/diylc/api/v1
*
* @author bancika
*
*/
public interface ServiceAPI {
public interface IServiceAPI {
public static final String URL_KEY = "serviceUrl";
diylc/diylc-core/src/org/diylc/plugins/cloud/presenter/CloudPresenter.java
+8 -6
View File
@@ -14,7 +14,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.plugins.cloud.model.ProjectEntity;
import org.diylc.plugins.cloud.model.ServiceAPI;
import org.diylc.plugins.cloud.model.IServiceAPI;
import org.diylc.plugins.cloud.model.UserEntity;
import com.diyfever.httpproxy.PhpFlatProxy;
@@ -30,7 +30,7 @@ public class CloudPresenter {
private final static Logger LOG = Logger.getLogger(CloudPresenter.class);
private static final Object SUCCESS = "Success";
private ServiceAPI service;
private IServiceAPI service;
private String serviceUrl;
private String machineId;
private String[] categories;
@@ -41,9 +41,9 @@ public class CloudPresenter {
public CloudPresenter(CloudListener listener) {
serviceUrl =
ConfigurationManager.getInstance().readString(ServiceAPI.URL_KEY, "http://www.diy-fever.com/diylc/api/v1");
ConfigurationManager.getInstance().readString(IServiceAPI.URL_KEY, "http://www.diy-fever.com/diylc/api/v1");
ProxyFactory factory = new ProxyFactory(new PhpFlatProxy());
service = factory.createProxy(ServiceAPI.class, serviceUrl);
service = factory.createProxy(IServiceAPI.class, serviceUrl);
if (service == null)
LOG.warn("Service proxy not created!");
this.listener = listener;
@@ -223,7 +223,8 @@ public class CloudPresenter {
throw new CloudException(res.toString());
if (res instanceof List<?>) {
List<ProjectEntity> projects = (List<ProjectEntity>) res;
// Download thumbnails and replace urls with local paths
LOG.info("Received " + projects.size() + " results");
// Download thumbnails and replace urls with local paths to speed up loading in the main thread
for (int i = 0; i < projects.size(); i++) {
String url = projects.get(i).getThumbnailUrl();
URL website = new URL(url);
@@ -231,7 +232,8 @@ public class CloudPresenter {
File temp = File.createTempFile("thumbnail", ".png");
FileOutputStream fos = new FileOutputStream(temp);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
projects.get(i).setThumbnailUrl(temp.getAbsolutePath());
projects.get(i).setThumbnailUrl(temp.getAbsolutePath());
fos.close();
}
return projects;
}