No known key found for this signature in database
GPG Key ID: 1D7529BE14E2BBA9
38 changed files with 872 additions and 819 deletions
Split View
Diff Options
-
+8 -0Pods/Pods.xcodeproj/project.pbxproj
-
+23 -19RSwitch.xcodeproj/project.pbxproj
-
+7 -7RSwitch/Base.lproj/Main.storyboard
-
+0 -0RSwitch/Swift/AboutViewController.swift
-
+0 -0RSwitch/Swift/AppAlerts/AppAlerts.swift
-
+0 -0RSwitch/Swift/AppDelegate.swift
-
+0 -4RSwitch/Swift/Downloaders/DownloadRStudio.swift
-
+6 -2RSwitch/Swift/Downloaders/DownloadTarball.swift
-
+7 -10RSwitch/Swift/HandleRSwitch.swift
-
+0 -0RSwitch/Swift/HandleSwitchTo.swift
-
+0 -0RSwitch/Swift/HandleUpdate.swift
-
+1 -1RSwitch/Swift/Menu.swift
-
+6 -2RSwitch/Swift/MenuActions/BrowseMenuAction.swift
-
+0 -0RSwitch/Swift/Notify.swift
-
+0 -0RSwitch/Swift/String+Version/Bundle.swift
-
+0 -0RSwitch/Swift/String+Version/String+Version.swift
-
+0 -0RSwitch/Swift/Utils/Globals.swift
-
+0 -0RSwitch/Swift/Utils/Launch.swift
-
+90 -0RSwitch/Swift/Utils/RVersions.swift
-
+56 -0RSwitch/Swift/Utils/Running.swift
-
+0 -0RSwitch/Swift/ViewController.swift
-
+0 -106RSwitch/swift/Utils/Versions+RunningUtils.swift
+ 8
- 0
Pods/Pods.xcodeproj/project.pbxproj
View File
+ 23
- 19
RSwitch.xcodeproj/project.pbxproj
View File
+ 7
- 7
RSwitch/Base.lproj/Main.storyboard
View File
RSwitch/swift/AboutViewController.swift → RSwitch/Swift/AboutViewController.swift
View File
RSwitch/swift/AppAlerts/AppAlerts.swift → RSwitch/Swift/AppAlerts/AppAlerts.swift
View File
RSwitch/swift/AppDelegate.swift → RSwitch/Swift/AppDelegate.swift
View File
RSwitch/swift/Downloaders/DownloadRStudio.swift → RSwitch/Swift/Downloaders/DownloadRStudio.swift
View File
RSwitch/swift/Downloaders/DownloadTarball.swift → RSwitch/Swift/Downloaders/DownloadTarball.swift
View File
RSwitch/swift/HandleRSwitch.swift → RSwitch/Swift/HandleRSwitch.swift
View File
RSwitch/swift/HandleSwitchTo.swift → RSwitch/Swift/HandleSwitchTo.swift
View File
RSwitch/swift/HandleUpdate.swift → RSwitch/Swift/HandleUpdate.swift
View File
RSwitch/swift/Menu.swift → RSwitch/Swift/Menu.swift
View File
RSwitch/swift/MenuActions/BrowseMenuAction.swift → RSwitch/Swift/MenuActions/BrowseMenuAction.swift
View File
RSwitch/swift/Notify.swift → RSwitch/Swift/Notify.swift
View File
RSwitch/swift/String+Version/Bundle.swift → RSwitch/Swift/String+Version/Bundle.swift
View File
RSwitch/swift/String+Version/String+Version.swift → RSwitch/Swift/String+Version/String+Version.swift
View File
RSwitch/swift/Utils/Utils.swift → RSwitch/Swift/Utils/Globals.swift
View File
RSwitch/swift/Utils/LaunchUtils.swift → RSwitch/Swift/Utils/Launch.swift
View File
+ 90
- 0
RSwitch/Swift/Utils/RVersions.swift
View File
| @ -0,0 +1,90 @@ | |||
| // | |||
| // RUtils.swift | |||
| // RSwitch | |||
| // | |||
| // Created by hrbrmstr on 9/1/19. | |||
| // Copyright © 2019 Bob Rudis. All rights reserved. | |||
| // | |||
| import Foundation | |||
| import Cocoa | |||
| struct versionInfo { | |||
| var path : String | |||
| var current: Bool | |||
| } | |||
| class RVersions { | |||
| static let macos_r_framework = "/Library/Frameworks/R.framework/Versions" // Where the official R installs go | |||
| static func currentVersionTarget() -> String { | |||
| // get where Current points to | |||
| let furl = NSURL(fileURLWithPath: RVersions.macos_r_framework + "/" + "Current") | |||
| if (furl.fileReferenceURL() != nil) { | |||
| do { | |||
| let fdat = try NSURL(resolvingAliasFileAt: furl as URL, options: []) | |||
| return(fdat.lastPathComponent!) | |||
| } catch { | |||
| return(furl.path!) | |||
| } | |||
| } else { | |||
| return("") | |||
| } | |||
| } | |||
| static func hasRBinary(versionPath : String) -> Bool { | |||
| return( | |||
| FileManager.default.fileExists( | |||
| atPath: (versionPath.starts(with: "/") ? "" : RVersions.macos_r_framework + "/" ) + | |||
| versionPath + "/Resources/bin/R" | |||
| ) | |||
| ) | |||
| } | |||
| static func reloadVersions() throws -> [String] { | |||
| // gets a directory listing | |||
| let entries = try FileManager.default.contentsOfDirectory(atPath: RVersions.macos_r_framework) | |||
| // retrieves all versions (excludes hidden files and the Current alias | |||
| return(entries.sorted().filter { !($0.hasPrefix(".")) && !($0 == "Current") }) | |||
| } | |||
| static func populateRVersionsMenu(menu : NSMenu, handler : Selector) { | |||
| do { | |||
| let targetPath = RVersions.currentVersionTarget() | |||
| let versions = try RVersions.reloadVersions() | |||
| // populate menu items with all installed R versions, ensuring we | |||
| // put a checkbox next to the one that is Current | |||
| var i = 1 | |||
| for version in versions { | |||
| let complete = RVersions.hasRBinary(versionPath: version) | |||
| let keynum = (i < 10) ? String(i) : "" | |||
| let item = NSMenuItem( | |||
| title: complete ? version : version + " (incomplete)", | |||
| action: complete ? handler : nil, | |||
| keyEquivalent: complete ? keynum : "" | |||
| ) | |||
| item.isEnabled = complete | |||
| if (version == targetPath) { item.state = NSControl.StateValue.on } | |||
| item.representedObject = version | |||
| menu.addItem(item) | |||
| i = complete ? i + 1 : i | |||
| } | |||
| } catch { | |||
| AppAlerts.quitAlert("Failed to list contents of R framework directory. You either do not have R installed or have incorrect permissions set on " + RVersions.macos_r_framework) | |||
| } | |||
| } | |||
| } | |||
+ 56
- 0
RSwitch/Swift/Utils/Running.swift
View File
| @ -0,0 +1,56 @@ | |||
| // | |||
| // VersionsUtils.swift | |||
| // RSwitch | |||
| // | |||
| // Created by hrbrmstr on 8/30/19. | |||
| // Copyright © 2019 Bob Rudis. All rights reserved. | |||
| // | |||
| import Foundation | |||
| import Cocoa | |||
| extension AppDelegate { | |||
| // Show the framework dir in a new Finder window | |||
| @objc func openFrameworksDir(_ sender: NSMenuItem?) { | |||
| NSWorkspace.shared.openFile(RVersions.macos_r_framework, withApplication: "Finder") | |||
| } | |||
| func populateRunningApps(menu : NSMenu) { | |||
| // gather running RStudio instances | |||
| let running_rstudios = NSWorkspace.shared.runningApplications.filter { | |||
| $0.bundleIdentifier == bundleIds.rstudio | |||
| } | |||
| // gather running R GUI instances | |||
| let running_rapps = NSWorkspace.shared.runningApplications.filter { | |||
| $0.bundleIdentifier == bundleIds.r_base | |||
| } | |||
| // if we have any running instances of anything | |||
| if ((running_rstudios.count) + (running_rapps.count) > 0) { | |||
| menu.addItem(NSMenuItem.separator()) | |||
| let switchToDropdown = NSMenuItem(title: "Switch to", action: nil, keyEquivalent: "") | |||
| let switchToSub = NSMenu() | |||
| menu.addItem(switchToDropdown) | |||
| menu.setSubmenu(switchToSub, for: switchToDropdown) | |||
| // populate RStudio first (it'll be in launch order) then R GUI | |||
| for app in running_rstudios + running_rapps { | |||
| let args = getArgs(app.processIdentifier)! | |||
| let title = app.localizedName! + (args.count > 1 ? " : " + (args[1] as! NSString).lastPathComponent.replacingOccurrences(of: ".Rproj", with: "") : "") | |||
| let mi = NSMenuItem(title: title, action: #selector(switch_to), keyEquivalent: "") | |||
| mi.representedObject = app | |||
| switchToSub.addItem(mi) | |||
| } | |||
| } | |||
| } | |||
| } | |||
RSwitch/swift/ViewController.swift → RSwitch/Swift/ViewController.swift
View File
+ 0
- 106
RSwitch/swift/Utils/Versions+RunningUtils.swift
View File
| @ -1,106 +0,0 @@ | |||
| // | |||
| // VersionsUtils.swift | |||
| // RSwitch | |||
| // | |||
| // Created by hrbrmstr on 8/30/19. | |||
| // Copyright © 2019 Bob Rudis. All rights reserved. | |||
| // | |||
| import Foundation | |||
| import Cocoa | |||
| extension AppDelegate { | |||
| // Show the framework dir in a new Finder window | |||
| @objc func openFrameworksDir(_ sender: NSMenuItem?) { | |||
| NSWorkspace.shared.openFile(app_dirs.macos_r_framework, withApplication: "Finder") | |||
| } | |||
| func populateRVersionsMenu(menu : NSMenu) { | |||
| let fm = FileManager.default | |||
| var targetPath:String? = nil | |||
| do { | |||
| // gets a directory listing | |||
| let entries = try fm.contentsOfDirectory(atPath: app_dirs.macos_r_framework) | |||
| // retrieves all versions (excludes hidden files and the Current alias | |||
| let versions = entries.sorted().filter { !($0.hasPrefix(".")) && !($0 == "Current") } | |||
| let hasCurrent = entries.filter { $0 == "Current" } | |||
| // if there was a Current alias (prbly shld alert if not) | |||
| if (hasCurrent.count > 0) { | |||
| // get where Current points to | |||
| let furl = NSURL(fileURLWithPath: app_dirs.macos_r_framework + "/" + "Current") | |||
| if (furl.fileReferenceURL() != nil) { | |||
| do { | |||
| let fdat = try NSURL(resolvingAliasFileAt: furl as URL, options: []) | |||
| targetPath = fdat.lastPathComponent! | |||
| } catch { | |||
| targetPath = furl.path | |||
| } | |||
| } | |||
| // populate menu items with all installed R versions, ensuring we | |||
| // put a checkbox next to the one that is Current | |||
| var i = 1 | |||
| for version in versions { | |||
| let keynum = (i < 10) ? String(i) : "" | |||
| let item = NSMenuItem(title: version, action: #selector(handleRSwitch), keyEquivalent: keynum) | |||
| item.isEnabled = true | |||
| if (version == targetPath) { item.state = NSControl.StateValue.on } | |||
| item.representedObject = version | |||
| menu.addItem(item) | |||
| i = i + 1 | |||
| } | |||
| } | |||
| } catch { | |||
| AppAlerts.quitAlert("Failed to list contents of R framework directory. You either do not have R installed or have incorrect permissions set on " + app_dirs.macos_r_framework) | |||
| } | |||
| } | |||
| func populateRunningApps(menu : NSMenu) { | |||
| // gather running RStudio instances | |||
| let running_rstudios = NSWorkspace.shared.runningApplications.filter { | |||
| $0.bundleIdentifier == bundleIds.rstudio | |||
| } | |||
| // gather running R GUI instances | |||
| let running_rapps = NSWorkspace.shared.runningApplications.filter { | |||
| $0.bundleIdentifier == bundleIds.r_base | |||
| } | |||
| // if we have any running instances of anything | |||
| if ((running_rstudios.count) + (running_rapps.count) > 0) { | |||
| menu.addItem(NSMenuItem.separator()) | |||
| let switchToDropdown = NSMenuItem(title: "Switch to", action: nil, keyEquivalent: "") | |||
| let switchToSub = NSMenu() | |||
| menu.addItem(switchToDropdown) | |||
| menu.setSubmenu(switchToSub, for: switchToDropdown) | |||
| // populate RStudio first (it'll be in launch order) then R GUI | |||
| for app in running_rstudios + running_rapps { | |||
| let args = getArgs(app.processIdentifier)! | |||
| let title = app.localizedName! + (args.count > 1 ? " : " + (args[1] as! NSString).lastPathComponent.replacingOccurrences(of: ".Rproj", with: "") : "") | |||
| let mi = NSMenuItem(title: title, action: #selector(switch_to), keyEquivalent: "") | |||
| mi.representedObject = app | |||
| switchToSub.addItem(mi) | |||
| } | |||
| } | |||
| } | |||
| } | |||