Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prettified Code!

Browse source
This commit is contained in:
Mashintime 2023-03-05 21:16:43 +00:00 committed by GitHub Action
parent feeced7ed3
commit d9ef0e6208
2 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gui/preload-chat.js
View file

@ -4,7 +4,7 @@ const { v4: uuidv4 } = require("uuid");
const imageCompression = require("browser-image-compression"); const imageCompression = require("browser-image-compression");
const blobUtil = require("blob-util"); const blobUtil = require("blob-util");
const FD = require("./freedata"); const FD = require("./freedata");
const fs = require('fs'); const fs = require("fs");
// https://stackoverflow.com/a/26227660 // https://stackoverflow.com/a/26227660
var appDataFolder = var appDataFolder =
@ -831,7 +831,10 @@ ipcRenderer.on("action-new-msg-received", (event, arg) => {
if (config.enable_request_shared_folder == "True") { if (config.enable_request_shared_folder == "True") {
sendSharedFolderList(item.dxcallsign); sendSharedFolderList(item.dxcallsign);
} }
} else if (splitted_data[1] == "req" && splitted_data[2].substring(0,1) == "2") { } else if (
splitted_data[1] == "req" &&
splitted_data[2].substring(0, 1) == "2"
) {
let name = splitted_data[2].substring(1); let name = splitted_data[2].substring(1);
//console.log("In handle req for shared folder file"); //console.log("In handle req for shared folder file");
obj.uuid = uuidv4().toString(); obj.uuid = uuidv4().toString();
@ -2128,7 +2131,6 @@ function sendSharedFolderList(dxcallsign) {
} }
function sendSharedFolderFile(dxcallsign, filename) { function sendSharedFolderFile(dxcallsign, filename) {
let filePath = path.join(config.shared_folder_path, filename); let filePath = path.join(config.shared_folder_path, filename);
console.log("In fuction sendSharedFolderFile ", filePath); console.log("In fuction sendSharedFolderFile ", filePath);
@ -2147,7 +2149,7 @@ function sendSharedFolderFile(dxcallsign,filename) {
let fileData = null; let fileData = null;
try { try {
//Has to be binary //Has to be binary
let data = fs.readFileSync(filePath) let data = fs.readFileSync(filePath);
fileData = data.toString("utf-8"); fileData = data.toString("utf-8");
} catch (err) { } catch (err) {
console.log(err); console.log(err);
@ -2158,7 +2160,7 @@ function sendSharedFolderFile(dxcallsign,filename) {
command: "responseSharedFile", command: "responseSharedFile",
dxcallsign: dxcallsign, dxcallsign: dxcallsign,
file: filename, file: filename,
filedata: fileData filedata: fileData,
}); });
} }

13
gui/sock.js
View file

@ -745,8 +745,17 @@ exports.sendResponseSharedFolderList = function (dxcallsign, sharedFolderList) {
}; };
//Send shared file response //Send shared file response
exports.sendResponseSharedFile = function (dxcallsign, sharedFile, sharedFileData) { exports.sendResponseSharedFile = function (
console.log("In sendResponseSharedFile",dxcallsign,sharedFile,sharedFileData) dxcallsign,
sharedFile,
sharedFileData
) {
console.log(
"In sendResponseSharedFile",
dxcallsign,
sharedFile,
sharedFileData
);
//Command 0 = user/station information //Command 0 = user/station information
//Command 1 = shared folder list //Command 1 = shared folder list
//Command 2 = shared file transfer //Command 2 = shared file transfer