code till file upload working

Author: skp-github

app/build.gradle

@@ -23,6 +23,7 @@ android {
     }
     packagingOptions {
         exclude 'org/eclipse/jetty/http/encoding.properties'
+        resources.excludes.add("META-INF/*")
     }
 }
 
@@ -33,4 +34,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    api 'com.github.ok2c.hc5.android:httpclient-android:0.2.0'
 }

app/src/main/java/com/googleresearch/capturesync/MainActivity.java

@@ -398,7 +398,7 @@ private void handleWebSocketMsg(@NotNull WsMessageContext wsMessageContext){
                             filename = list[i].getName();
                             if(filename.startsWith(infoParts[2])){
                                 String[] fileList = {filePath + filename};
-                                new RemoteFileUpload().execute(fileList);
+                                new UploadFileToServer().execute(fileList);
                             }
                     }
                 }

app/src/main/java/com/googleresearch/capturesync/UploadFileToServer.java

@@ -0,0 +1,75 @@
+package com.googleresearch.capturesync;
+
+import java.io.File;
+
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.mime.FileBody;
+import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import java.io.IOException;
+import android.os.AsyncTask;
+
+
+
+public class UploadFileToServer extends AsyncTask<String, Integer, String> {
+    @Override
+    protected void onPreExecute() {
+        // setting progress bar to zero
+        super.onPreExecute();
+    }
+
+    @Override
+    protected void onProgressUpdate(Integer... progress) {
+
+    }
+
+    @Override
+    protected String doInBackground(String... selectedFilePaths) {
+        return uploadFile(selectedFilePaths);
+    }
+
+    @SuppressWarnings("deprecation")
+    private String uploadFile(String... selectedFilePaths) {
+        String responseString = "All Good";
+        HttpResponse httpResponse;
+        int statusCode;
+        String response = "";
+
+
+        try (final CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            final HttpPost httpPost = new HttpPost("http://192.168.5.1:5000/upload");
+
+            final File video_file = new File(selectedFilePaths[0]);
+            MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+            builder.setMode(HttpMultipartMode.LEGACY);
+            builder.addPart("file", new FileBody(video_file));
+            HttpEntity entity = builder.build();
+            httpPost.setEntity(entity);
+            httpResponse = httpClient.execute(httpPost);
+            statusCode = httpResponse.getCode();
+            System.out.println("Response Status:" + statusCode);
+            System.out.println("FILE UPLOADED");
+
+        } catch (IOException e) {
+            responseString = e.toString();
+        }
+        return responseString;
+
+    }
+
+    @Override
+    protected void onPostExecute(String result) {
+
+        super.onPostExecute(result);
+    }
+
+}
+
+
+
+

fileserver/file_server.py

@@ -14,7 +14,7 @@
 
 app.secret_key = "recSync-fileserver"
 
-UPLOAD_FOLDER = 'static/uploads'
+UPLOAD_FOLDER = 'static/uploads/'
 app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 
 ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif', 'mov', 'mp4'])
@@ -28,26 +28,38 @@ def main():
 
 @app.route('/upload', methods=['POST'])
 def upload_file():
-    # check if the post request has the file part
-    data = request.get_data()
-    import pdb;pdb.set_trace()
-    dd = b''.join(data.split(b'\r')[3:6])[2:]
-    #dd = data.split(b'\r')[5]
-    with open('binary.mp4', 'wb') as wfile:
-        wfile.write(dd.decode())
-
-    if 'name' not in request.files:
-        print("request inside files not found")
-        resp = jsonify({'message' : 'No file part in the request'})
-        print(resp.data)
-        resp.status_code = 400
-        return resp
-
-    errors = {}
-    success = False
-    resp = jsonify({"message" : "git files"})
-    resp.status_code = 200
-    return resp
+   #import pdb; pdb.set_trace()
+   if 'file' not in request.files:
+           resp = jsonify({'message' : 'No file part in the request'})
+           resp.status_code = 400
+           return resp
+
+   files = request.files.getlist('file')
+
+   errors = {}
+   success = False
+
+   for file in files:
+       if file and allowed_file(file.filename):
+           filename = secure_filename(file.filename)
+           file.save(os.path.join(app.config['UPLOAD_FOLDER'], filename))
+           success = True
+       else:
+           errors[file.filename] = 'File type is not allowed'
+
+   if success and errors:
+       errors['message'] = 'File(s) successfully uploaded'
+       resp = jsonify(errors)
+       resp.status_code = 500
+       return resp
+   if success:
+       resp = jsonify({'message' : 'Files successfully uploaded'})
+       resp.status_code = 201
+       return resp
+   else:
+       resp = jsonify(errors)
+       resp.status_code = 500
+       return resp
 
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=5000,debug=True)

remote_control/remote_control.py

@@ -34,14 +34,15 @@ def statusBtn(self):
         self.label.setText(message)
     def downloadBtn(self):
         endpoint = self.api_input.toPlainText()
-        self.ws.send("UPLOAD@@"+endpoint+"@@Test_UPLOAD")
+        download_prefix = self.download_prefix_text.toPlainText()
+        self.ws.send("UPLOAD@@"+endpoint+"@@"+download_prefix)
 
     def setupUi(self, MainWindow):
         self.ws = websocket.WebSocket()
         #self.ws.connect("ws://172.16.62.107:7867/remotecon")
         self.ws.connect("ws://192.168.5.2:7867/remotecon")
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(800, 600)
+        MainWindow.resize(800, 800)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.label = QtWidgets.QLabel(self.centralwidget)
@@ -69,8 +70,11 @@ def setupUi(self, MainWindow):
         self.api_input = QtWidgets.QTextEdit(self.centralwidget)
         self.api_input.setGeometry(QtCore.QRect(143, 390, 451, 31))
         self.api_input.setObjectName("textEdit")
+        self.download_prefix_text = QtWidgets.QTextEdit(self.centralwidget)
+        self.download_prefix_text.setGeometry(QtCore.QRect(280, 430, 161, 31))
+        self.download_prefix_text.setObjectName("prefix_text")
         self.download_btn = QtWidgets.QPushButton(self.centralwidget)
-        self.download_btn.setGeometry(QtCore.QRect(280, 450, 161, 61))
+        self.download_btn.setGeometry(QtCore.QRect(280, 500, 161, 61))
         self.download_btn.setFont(font)
         self.download_btn.setObjectName("pushButton_4")
         self.download_btn.clicked.connect(self.downloadBtn)
@@ -97,6 +101,7 @@ def retranslateUi(self, MainWindow):
         self.stop_btn.setText(_translate("MainWindow", "Stop"))
         self.status_btn.setText(_translate("MainWindow", "Status"))
         self.api_input.setPlaceholderText(_translate("MainWindow", "Please enter the api endpoint where you want the files to be uploaded "))
+        self.download_prefix_text.setPlaceholderText(_translate("MainWindow", "Session PREFIX for download "))
         self.download_btn.setText(_translate("MainWindow", "Download"))
         self.status_label.setPlaceholderText(_translate("MainWindow", "No status "))