From 36122d861ae2117aa19fe8f5404656e42e583e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Barrero=20Rodr=C3=ADguez?= <rbarreror@cnic.es>
Date: Tue, 22 Mar 2022 18:01:27 +0100
Subject: [PATCH] Fix openRes bug in \\network

---
 Launcher/launch.R          | 3 ++-
 ShinyApp/app.R             | 9 +++++----
 ShinyApp/public/index.html | 4 ++--
 release.py                 | 5 ++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Launcher/launch.R b/Launcher/launch.R
index 5620682..a7e24dc 100644
--- a/Launcher/launch.R
+++ b/Launcher/launch.R
@@ -12,4 +12,5 @@ launch.browser = function(appUrl, browser.path=chrome.portable) {
   shell(sprintf('"%s" --app=%s', browser.path, appUrl), wait=FALSE)
 }
 
-runApp("ShinyApp", launch.browser = launch.browser)
\ No newline at end of file
+runApp("ShinyApp", launch.browser = launch.browser)
+#runApp("ShinyApp", launch.browser = TRUE)
\ No newline at end of file
diff --git a/ShinyApp/app.R b/ShinyApp/app.R
index 2df8b24..c2c0b87 100644
--- a/ShinyApp/app.R
+++ b/ShinyApp/app.R
@@ -212,9 +212,10 @@ calculatePvalues <- function(obj) {
   reportData <- cbind(reportData, pvalues_df)
   reportData <- data.frame(mapply('c', header, reportData))
   
-  outDir <- dirname(obj$filePath)
+  outDir <- dirname(obj$filePath) # dirname changes \\ --> /, yielding error in \\tierra...
+  outDir <- gsub("/", "\\\\", outDir) # fix it //tierra...
   outFile <- paste("LIMMA", basename(obj$filePath), sep="_")
-  outPath <- paste(outDir, outFile, sep="/")
+  outPath <- paste(outDir, outFile, sep="\\")
   
   write.table(reportData, file = outPath, quote = F, sep = "\t", row.names = F,
               col.names = F, na="")
@@ -279,11 +280,11 @@ server <- function (input, output, session) {
   })
   
   observeEvent(input$openRes, {
-    shell.exec(dirname(input$openRes))
+    shell.exec(gsub('/', '\\\\', dirname(input$openRes)))
   })
   
   observeEvent(input$viewLogs, {
-    shell.exec(paste(getwd(), "log", paste(input$viewLogs, ".log", sep=""), sep="/"))
+    shell.exec(paste(getwd(), "log", paste(input$viewLogs, ".log", sep=""), sep="\\"))
   })
   
   observeEvent(input$areYouAlive, {
diff --git a/ShinyApp/public/index.html b/ShinyApp/public/index.html
index 5d2946c..d42c529 100644
--- a/ShinyApp/public/index.html
+++ b/ShinyApp/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>ReportStats-iSanXoT v0.2.1</title>
+    <title>ReportStats-iSanXoT v0.2.2</title>
 
     <!--
     <link rel="stylesheet" href="assets/bootstrap.min.css">
@@ -26,7 +26,7 @@
             <div>
                 <img src="favicon.ico" height="150">
             </div>
-            <h1 class="display-2 text-center align-self-center ml-2">ReportStats - iSanXoT<span style="font-size:0.3em">v0.2.1</span></h1>
+            <h1 class="display-2 text-center align-self-center ml-2">ReportStats - iSanXoT<span style="font-size:0.3em">v0.2.2</span></h1>
         </div>
         
         
diff --git a/release.py b/release.py
index 22068b3..80e275d 100644
--- a/release.py
+++ b/release.py
@@ -7,13 +7,16 @@
 # main function
 if __name__ == "__main__":
     version = sys.argv[1] #"vx.y"
+    mode = sys.argv[2] # "chromium" or "browser"
+
     versionName = f"ReportStats-iSanXoT-{version}"
+    versionName += "-browser" if mode == "browser" else ""
     home = os.getcwd()
     version_dir = os.path.join(home, versionName)
 
     os.mkdir(version_dir)
 
-    shutil.copytree(os.path.join(home, "ChromiumPortable"), os.path.join(version_dir, "ChromiumPortable"))
+    if mode == "chromium": shutil.copytree(os.path.join(home, "ChromiumPortable"), os.path.join(version_dir, "ChromiumPortable"))
     shutil.copytree(os.path.join(home, "R-Portable"), os.path.join(version_dir, "R-Portable"))
     shutil.copytree(os.path.join(home, "ShinyApp"), os.path.join(version_dir, "ShinyApp"))
     shutil.copytree(os.path.join(home, "Launcher"), os.path.join(version_dir, "Launcher"))