Skip to content

Commit

Permalink
add updater (maybe)
Browse files Browse the repository at this point in the history
  • Loading branch information
lsteinmann committed Mar 6, 2023
1 parent b53f678 commit b1cfe89
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 19 deletions.
5 changes: 3 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# milQuant 1.0.1 _tba_
# milQuant 1.0.1 _2023-03-05_
* clean up main.js a lot, restructure directory
* restructure the menu bar at the top and add links to GitHub, the Miletus Excavation Homepage, and an about-window
* add a modal for default settings to the topmenu so users have custom default connection settingson their computer and don't need to reenter password
* remove bug where app would exit on every output from shiny
* add electron-updater/autoUpdater
* from milQuant:
* the connection settings (name/pw) are reusable (with milQuant-dist)
* improved plot legends and added bar plot display options
* fixed period order in pottery & quant B plots
* fixed issue with dates
* use plotly for all graphs
* add a workflow overview to allfinds plot
* add a workflow overview
* add object table to pottery plot

# milQuant 1.0.0 _2023-02-21_
Expand Down
4 changes: 2 additions & 2 deletions R-win-port/load_packages.R
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
packages <- c("shiny", "shinydashboard", "shinycssloaders", "shinyjs", "shinyWidgets",
"ggplot2", "dplyr", "reshape2", "viridis", "forcats", "tidyr",
"ggplot2", "dplyr", "reshape2", "viridis", "forcats", "tidyr", "DT",
"remotes", "idaifieldR", "sofa", "plotly",
"glue")
for (p in packages) {
if (p == "idaifieldR") {
remotes::install_github("lsteinmann/idaifieldR@v0.2.2", lib = "library/", force = TRUE)
} else {
install.packages(p, lib = "library/")
install.packages(p, lib = "library/", repos='http://cran.us.r-project.org')
}
}
rm(packages, p)
6 changes: 5 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ const fs = require('fs');
const child = require('child_process');

const { readDefaultSettings, settingsFileName } = require('./imports/settings');
const { handleSquirrelEvent } = require('./imports/squirrel-handler')

const { autoUpdater } = require('electron-updater')
autoUpdater.checkForUpdatesAndNotify()

console.log(autoUpdater.getFeedURL())

// not great to do that, maybe try to choose a random port?
const port = "3002"
Expand Down Expand Up @@ -98,6 +101,7 @@ childProcess.stderr.on('data', (data) => {

// with delayedLoad() : first, an empty loading.html is loaded, then after a 3-second timeout, the shiny url
// this avoids the white screen that occurs if the windows loads before shiny is actually ready
// TODO: Probably better to make this wait for shiny Listening.. notification in next version
const delay = ms => new Promise(res => setTimeout(res, ms));
const delayedLoad = async () => {
mainWindow.loadFile('loading.html')
Expand Down
99 changes: 85 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@
"@electron-forge/maker-zip": "^6.0.5",
"electron": "^23.1.1",
"electron-squirrel-startup": "^1.0.0"
},
"dependencies": {
"electron-updater": "^5.3.0"
}
}

0 comments on commit b1cfe89

Please sign in to comment.