another attempt fixing shared folder

This commit is contained in:
DJ2LS 2023-03-19 16:32:57 +01:00
parent 6a8e3f4afc
commit 6ef7b34204

View file

@ -903,8 +903,7 @@ ipcRenderer.on("action-new-msg-received", (event, arg) => {
console.log(filelist);
userData.user_shared_folder = filelist;
addFileListToUserDatabaseIfNotExists(userData);
console.log(selected_callsign);
getSetUserInformation(obj.dxcallsign);
getSetUserSharedFolder(obj.dxcallsign);
//getSetUserInformation(selected_callsign);
} else if (splitted_data[1] == "res-2") {
@ -1687,6 +1686,7 @@ addFileListToUserDatabaseIfNotExists = function (obj) {
.then(function (response) {
console.log("File List: NEW USER ADDED");
getSetUserInformation(obj.user_info_callsign);
})
.catch(function (err) {
console.log(err);
@ -1898,6 +1898,145 @@ async function updateAllChat(clear) {
}
}
function getSetUserSharedFolder(selected_callsign){
if (
selected_callsign == "" ||
selected_callsign == null ||
typeof selected_callsign == "undefined"
)
return;
returnObjFromCallsign(users, selected_callsign)
.then(function (data) {
console.log(data)
console.log(data.user_shared_folder);
if (typeof data.user_shared_folder !== "undefined") {
// shared folder table
var icons = [
"aac",
"ai",
"bmp",
"cs",
"css",
"csv",
"doc",
"docx",
"exe",
"gif",
"heic",
"html",
"java",
"jpg",
"js",
"json",
"jsx",
"key",
"m4p",
"md",
"mdx",
"mov",
"mp3",
"mp4",
"otf",
"pdf",
"php",
"png",
"ppt",
"pptx",
"psd",
"py",
"raw",
"rb",
"sass",
"scss",
"sh",
"sql",
"svg",
"tiff",
"tsx",
"ttf",
"txt",
"wav",
"woff",
"xls",
"xlsx",
"xml",
"yml",
];
var tbl = document.getElementById("sharedFolderTableDX");
tbl.innerHTML = "";
let counter = 0;
data.user_shared_folder.forEach((file) => {
var row = document.createElement("tr");
let dxcall = selected_callsign;
let name = file["name"];
let type = file["extension"];
if (icons.indexOf(type) == -1) {
type = "bi-file-earmark";
} else {
type = "bi-filetype-" + type;
}
let id = document.createElement("td");
let idText = document.createElement("span");
counter += 1;
idText.innerHTML +=
'<i class="bi bi-file-earmark-arrow-down" style="font-size: 1.8rem;cursor: pointer"></i> ' +
counter;
id.appendChild(idText);
row.appendChild(id);
let filename = document.createElement("td");
let filenameText = document.createElement("span");
filenameText.innerText = file["name"];
filename.appendChild(filenameText);
row.appendChild(filename);
let filetype = document.createElement("td");
let filetypeText = document.createElement("span");
filetypeText.innerHTML = `<i class="bi ${type}" style="font-size: 1.8rem"></i>`;
filetype.appendChild(filetypeText);
row.appendChild(filetype);
let filesize = document.createElement("td");
let filesizeText = document.createElement("span");
filesizeText.innerText = formatBytes(file["size"], 2);
filesize.appendChild(filesizeText);
row.appendChild(filesize);
id.addEventListener("click", function () {
//console.log(name," clicked");
sendFileReq(dxcall, name);
});
tbl.appendChild(row);
});
} else {
document.getElementById("sharedFolderTableDX").innerHTML = "no data";
}
})
.catch(function (err) {
document.getElementById("sharedFolderTableDX").innerHTML = "no data";
});
}
function getSetUserInformation(selected_callsign) {
//Get user information
@ -1913,6 +2052,9 @@ function getSetUserInformation(selected_callsign) {
returnObjFromCallsign(users, selected_callsign)
.then(function (data) {
console.log(data)
// image
if (typeof data.user_info_image !== "undefined") {
document.getElementById("dx_user_info_image").src =