You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2015/07/27 12:05:46 UTC
[09/18] incubator-taverna-mobile git commit: implementing run outputs
and logs download
implementing run outputs and logs download
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/b217240c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b217240c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b217240c
Branch: refs/heads/master
Commit: b217240c88fabcb43d847e9cad5e772c16600218
Parents: 2122e78
Author: larrytech7 <la...@gmail.com>
Authored: Sun Jul 19 15:10:58 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Sun Jul 19 15:10:58 2015 +0100
----------------------------------------------------------------------
.../fragments/workflowdetails/RunFragment.java | 37 +++++++++++++++++++-
.../mobile/utils/WorkflowDownloadManager.java | 15 --------
2 files changed, 36 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b217240c/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java
index 3b232c3..05d84ce 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java
@@ -3,6 +3,7 @@ package org.apache.taverna.mobile.fragments.workflowdetails;
import android.content.Context;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.text.method.ScrollingMovementMethod;
import android.util.Base64;
@@ -16,15 +17,19 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
+import android.widget.Toast;
import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.activities.DashboardMainActivity;
import org.apache.taverna.mobile.tavernamobile.TavernaPlayerAPI;
+import org.apache.taverna.mobile.utils.WorkflowDownloadManager;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Text;
import java.io.BufferedReader;
import java.io.DataOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -33,6 +38,8 @@ import java.net.URL;
import java.util.Timer;
import java.util.TimerTask;
+import static org.apache.taverna.mobile.activities.DashboardMainActivity.APP_DIRECTORY_NAME;
+
/**
* A simple {@link Fragment} subclass.
* Use the {@link RunFragment#newInstance} factory method to
@@ -47,6 +54,8 @@ public class RunFragment extends Fragment implements View.OnClickListener{
private TextView runStateTextView, runStartTime,runEndTime, runInputsText;
private Button downloadOutput,downloadLogs;
private int run_id;
+ private String run_output_url = "";
+ private String run_logs_url = "";
/**
* Use this factory method to create a new instance of
@@ -167,7 +176,30 @@ public class RunFragment extends Fragment implements View.OnClickListener{
@Override
public void onClick(View view) {
-
+ switch(view.getId()){
+ case R.id.buttonWorkflowDownloadOutput:
+ try {
+ new WorkflowDownloadManager(getActivity()).downloadWorkflow(
+ new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString(
+ APP_DIRECTORY_NAME+"/Runoutput/outputs","/Runouput/outputs/")),
+ new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL+run_output_url.substring(0,5));
+ } catch (Exception e) {
+ e.printStackTrace();
+ Toast.makeText(getActivity(), "Error downloading run output",Toast.LENGTH_LONG).show();
+ }
+ break;
+ case R.id.downloadRunLogs:
+ try {
+ new WorkflowDownloadManager(getActivity()).downloadWorkflow(
+ new File(PreferenceManager.getDefaultSharedPreferences(getActivity()).getString(
+ APP_DIRECTORY_NAME+"/Runoutput/logs/","/Runoutput/logs")),
+ new TavernaPlayerAPI(getActivity()).PLAYER_RUN_URL+run_logs_url.substring(0,5));
+ } catch (Exception e) {
+ e.printStackTrace();
+ Toast.makeText(getActivity(), "Error downloading run logs",Toast.LENGTH_LONG).show();
+ }
+ break;
+ }
}
public void updateRun(final JSONObject runInfo){
@@ -190,6 +222,9 @@ public class RunFragment extends Fragment implements View.OnClickListener{
status.setImageResource(android.R.drawable.presence_offline);
else
status.setImageResource(android.R.drawable.presence_invisible);
+
+ run_output_url = runInfo.getString("outputs_zip");
+ run_logs_url = runInfo.getString("log");
} catch (JSONException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b217240c/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
index 8364e42..3c645ce 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDownloadManager.java
@@ -90,21 +90,6 @@ public class WorkflowDownloadManager {
if(id != 0)
sendNotification(this.context.getResources().getString(R.string.downloadprogress));
- /* int status = cur.getInt(cur.getColumnIndex(DownloadManager.COLUMN_STATUS));
- switch (status) {
- case DownloadManager.STATUS_SUCCESSFUL:
- sendNotification(this.context.getResources().getString(R.string.downloadcomplete));
- break;
- case DownloadManager.STATUS_FAILED:
- sendNotification(this.context.getResources().getString(R.string.downloaderror));
- break;
- case DownloadManager.STATUS_RUNNING:
- sendNotification(this.context.getResources().getString(R.string.downloadprogress));
- break;
- case DownloadManager.ERROR_FILE_ALREADY_EXISTS:
- sendNotification(this.context.getResources().getString(R.string.downloadduplicate));
- break;
- }*/
cur.close();
}
}