From 4b883790c78627b90980a702558db5f2b8d70831 Mon Sep 17 00:00:00 2001 From: Suchandra Thapa Date: Sun, 29 Mar 2020 18:49:01 -1000 Subject: [PATCH 1/2] Update to fix api calls --- converttomarkdown.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/converttomarkdown.js b/converttomarkdown.js index 8d325e4..055a6ee 100644 --- a/converttomarkdown.js +++ b/converttomarkdown.js @@ -167,7 +167,8 @@ function ConvertToMarkdown() { //Checking if the common folder is present in user's google drive. If not creating it. if (checkIfFolderExists(commonFolderName)) { - commonFolder = DriveApp.getFolderByName(commonFolderName); + folderIter = DriveApp.getFoldersByName(commonFolderName); + commonFolder = folderIter.next(); } else { commonFolder = DriveApp.createFolder(commonFolderName); } @@ -184,7 +185,7 @@ function ConvertToMarkdown() { if (file) { file.replace(text); } else { - file = DriveApp.createFile(DocumentApp.getActiveDocument().getName() + ".md", text, 'text/plain'); + file = folder.createFile(DocumentApp.getActiveDocument().getName() + ".md", text, 'text/plain'); folder.addFile(file); } @@ -259,7 +260,8 @@ function downloadMdFile() { function checkIfFolderExists(folderName) { var exist = true; try { - var testFolder = DriveApp.getFolderByName(folderName); + var testFolder = DriveApp.getFoldersByName(folderName); + exist = testFolder.hasNext() } catch (err) { exist = false; } @@ -303,12 +305,12 @@ function checkIfFolderExistsInParent(parentFolder, folderName) { if (folderCollection.length == 0) exist = false; else { - for (var i = 0; i < folderCollection.length; i++) { - if (folderCollection[i].getName() == folderName) { - exist = folderCollection[i]; - return exist; - } - } + while (folderCollection.hasNext()) { + childFolder = folderCollection.next() + if (childFolder.getName() == folderName) { + return childFolder + } + } } exist = false; } catch (err) { From 5ce40b2d3a1e2922586206128b9e7e577412c35a Mon Sep 17 00:00:00 2001 From: Suchandra Thapa Date: Wed, 1 Apr 2020 15:36:43 -1000 Subject: [PATCH 2/2] Fix filecheck and overwriting --- converttomarkdown.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/converttomarkdown.js b/converttomarkdown.js index 055a6ee..ba067cf 100644 --- a/converttomarkdown.js +++ b/converttomarkdown.js @@ -183,7 +183,7 @@ function ConvertToMarkdown() { //Checking if MD file with same name is already present inside that folder. If present it will override the older file. If not it will create the new file. file = checkIfFileExists(folder, DocumentApp.getActiveDocument().getName() + ".md"); if (file) { - file.replace(text); + file.setContent(text); } else { file = folder.createFile(DocumentApp.getActiveDocument().getName() + ".md", text, 'text/plain'); folder.addFile(file); @@ -258,10 +258,11 @@ function downloadMdFile() { /* This function checks if there is a folder as given in the parameter exists in Google Drive */ function checkIfFolderExists(folderName) { - var exist = true; + var exist = false; try { var testFolder = DriveApp.getFoldersByName(folderName); - exist = testFolder.hasNext() + if testFolder.hasNext() + exist = testFolder.next() } catch (err) { exist = false; } @@ -320,14 +321,19 @@ function checkIfFolderExistsInParent(parentFolder, folderName) { } /* This function checks if there is a file as given in the parameter exists in Google Drive */ function checkIfFileExists(folder, fileName) { - var exist = true; + var exist = false; + try { - //var testFolder = DriveApp.getFolder(folderName); - var testFile = folder.find(fileName); - if (testFile.length > 0) - exist = testFile[0]; - else - exist = false; + var testFileIter = folder.getFilesByName(fileName); + if (!testFileIter.hasNext()) { + return false + } + var testFile = testFileIter.next() + if (testFile.getSize() > 0) { + exist = testFile; + } + Logger.log("file size not > 0 : " + testFile.getSize()); + exist = false; } catch (err) { exist = false; }