Jonathan/Dracon - Change 2N67RQZCVGL6GYJJLM2US4YVCEIUK25AHCLD66C7HR4PPTNUOCWAC

Add auto installation support and cache content of ContentRevision

Created by Jonathan on April 3, 2021

2N67RQZCVGL6GYJJLM2US4YVCEIUK25AHCLD66C7HR4PPTNUOCWAC

Dependencies

In channels

main

Change contents

Insertion in src/main/resources/messages/DraconBundle.properties at line 19 [5.105]
[3.55]
[4.82]
```
action.Pijul.InvalidateCaches.text=Invalidate Caches
```

Replacement in src/main/resources/messages/DraconBundle.properties at line 42 [5.105]

B:BD[3.383] → [3.383:499]

expert.mode.notification.failure=Failed to record changes with exit code <bold>{0}</bold> and message: <tt>{1}</tt>.

[3.383]

expert.mode.notification.failure=Failed to record changes with exit code <bold>{0}</bold> and message: <tt>{1}</tt>.
cache.invalidate.text=Invalidating caches...
cache.invalidate.current.text=Invalidating <em>{0}</em>...
cache.invalidate.finish.text=Invalidated caches
install.pijul.title=Install pijul
install.pijul.title2=Install Pijul
install.pijul.text=Cannot find pijul binaries.\n\
  Do you want to install pijul using rust cargo?
install.editor.server.title=Install editor-server
install.editor.server.title2=Install Editor Server
install.editor.server.text=Cannot find editor-server binaries.\n\
  Dracon depends on editor-server for interfacing with Pijul.\n\
  Do you want to install editor-server using rust cargo?
install.cargo.title=Install Rustup and Cargo
install.cargo.text=In order to install <tt>{0}</tt> you need to have cargo installed.\n\
  However we cannot find cargo installed in this machine.\n\
  Do you want to install rustup with cargo?\n\
  If you agree, we will download rustup and launch the installer, you take from there.
install.pijul.warning.text=You won't be able to use Dracon plugin since some dependencies could not be installed.
install.cargo.running.text=Running cargo install...

Insertion in src/main/resources/META-INF/plugin.xml at line 31 [5.1490]

[3.680]

[5.2261]

        <postStartupActivity implementation="com.github.jonathanxd.dracon.activity.PijulPostStartupActivity"/>

Insertion in src/main/resources/META-INF/plugin.xml at line 42 [5.1490]

[4.1228]

        </action>
        <action id="Pijul.InvalidateCaches" class="com.github.jonathanxd.dracon.actions.PijulInvalidateCaches">

Insertion in src/main/resources/META-INF/plugin.xml at line 71 [5.1490]

[4.2184]

            <reference ref="Pijul.InvalidateCaches"/>
            <separator/>

Deletion in src/main/resources/META-INF/plugin.xml at line 75 [5.1490]
B:BD[4.2349] → [4.2349:2350]
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 9 [6.204]
[6.387]
[6.387]
```
    return findBinaryOrNull(app) ?: app
}
fun findBinaryOrNull(app: String): String? {
```
Deletion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 41 [6.204]
B:BD[6.1811] → [6.1811:1826]
```
        ?: app
```
File move: listeners (----------) → listeners (d--x------)
BF:BFD[7.107] → [2.7096:7107]
[7.107]
[2.7108]
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 3 [8.5035]
[8.5082]
[8.5130]
```
import com.github.jonathanxd.dracon.cache.FileRevisionCache
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 5 [8.5035]
B:BD[8.5195] → [9.14860:14925]
```
import com.github.jonathanxd.dracon.revision.loadStateInRevision
```
[8.5195]
[8.5241]
```
import com.intellij.openapi.components.service
```
Replacement in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 21 [8.5035]
B:BD[8.5842] → [8.5842:5863]
```
): ContentRevision {
```
[8.5842]
[8.5863]
```
) : ContentRevision {
```

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 24 [8.5035]

B:BD[10.5064] → [10.5064:5175]

B:BD[10.5175] → [3.6188:6279]

∅:D[10.5283] → [8.5864:5904]

∅:D[3.6279] → [8.5864:5904]

B:BD[8.5864] → [8.5864:5904]

B:BD[8.5904] → [9.14926:15016]

∅:D[9.15016] → [8.5941:5947]

B:BD[8.5941] → [8.5941:5947]

    constructor(root: Path,
                filePath: FilePath,
                revision: PijulRevisionNumber,
                project: Project): this(root, Paths.get(filePath.path), revision, project)
    override fun getContent(): String {
        return loadStateInRevision(this.revision.hash, this.project, root, this.filePath)
    }

[10.5064]

[8.5947]

    constructor(
        root: Path,
        filePath: FilePath,
        revision: PijulRevisionNumber,
        project: Project
    ) : this(root, Paths.get(filePath.path), revision, project)
    private val content = this.project.service<FileRevisionCache>().loadAsync(this)
    override fun getContent(): String = String(this.content.get(), Charsets.UTF_8)

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 61 [7.10972]

B:BD[11.2187] → [11.2187:2257]

    private val pijulLogEntryCache = PijulLogEntryCache(this.project)

[11.2187]

[11.2257]

    private val pijulLogEntryCache by lazy {
        this.project.service<PijulLogEntryCache>()
    }

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 256 [7.10972]

[2.13228]

[8.10608]

                    }
                    val reset = this.reset(project, root)
                    if (reset.statusCode !is SuccessStatusCode) {
                        return reset

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryChangeCache.kt at line 54 [2.14446]

[2.16706]


    fun invalidate() {
        this.dataCache.invalidate()
        this.revisionDataCache.invalidate()
    }

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryCache.kt at line 6 [11.11397]
[11.11764]
[11.11764]
```
import com.intellij.openapi.components.Service
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryCache.kt at line 10 [11.11397]
[11.11967]
[11.11967]
```
@Service
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryCache.kt at line 21 [11.11397]
[2.17147]
[11.13103]
```
    }
    fun invalidate() {
        this.dataCache.invalidate()
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/FileStatusCache.kt at line 64 [2.17169]
[2.19595]
[2.19595]
```
    }
    fun invalidate() {
        this.cache.invalidate()
```
Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/FileRevisionCache.kt at line 3 [2.20156]
[2.20201]
[2.20201]
```
import com.github.jonathanxd.dracon.content.PijulContentRevision
```

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/FileRevisionCache.kt at line 32 [2.20156]

[2.21339]


    fun loadAsync(rev: PijulContentRevision): CompletableFuture<ByteArray> {
        val root = project.service<PijulVcsContext>().root
        val fileRev = FileRevisionRef(rev.filePath.toAbsolutePath().toString(), rev.revision.hash)
        return this.cache.queryOrLoadAsync(fileRev) {
            loadStateInRevision(
                rev.revision.hash,
                this.project,
                root,
                rev.filePath
            ).toByteArray(Charsets.UTF_8)
        }
    }
    fun invalidate() {
        this.cache.invalidate()
    }

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/DataCache.kt at line 138 [2.21452]

[2.25774]

        }
    }
    fun invalidate() {
        this.lock.lock()
        try {
            this.inMemory.clear()
            this.manager.write(this.inMemory)
        } finally {
            this.lock.unlock();

File addition: activity (----------)
[7.107]

File addition: PijulPostStartupActivity.kt (----------)

[0.3639]

package com.github.jonathanxd.dracon.activity
import com.github.jonathanxd.dracon.i18n.BUNDLE
import com.github.jonathanxd.dracon.i18n.DraconBundle
import com.github.jonathanxd.dracon.pijul.NonZeroExitStatusCode
import com.github.jonathanxd.dracon.pijul.Pijul
import com.github.jonathanxd.dracon.pijul.pijul
import com.github.jonathanxd.dracon.util.escapeXml
import com.github.jonathanxd.dracon.util.findBinary
import com.github.jonathanxd.dracon.util.findBinaryOrNull
import com.github.jonathanxd.dracon.util.wrapInHml
import com.github.jonathanxd.dracon.vcs.DraconVcsUtil
import com.github.jonathanxd.dracon.vcs.NotificationIds
import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.execution.util.ExecUtil
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.Task
import com.intellij.openapi.project.Project
import com.intellij.openapi.startup.StartupActivity
import com.intellij.openapi.ui.Messages
import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.vcs.VcsNotifier
import com.intellij.util.download.DownloadableFileService
import com.intellij.util.download.FileDownloader
import com.intellij.util.io.IdeUtilIoBundle
import com.intellij.vcsUtil.VcsUtil
import org.jetbrains.annotations.PropertyKey
import java.nio.file.Paths
import java.util.concurrent.CompletableFuture
class PijulPostStartupActivity : StartupActivity {
    override fun runActivity(project: Project) {
        val path = project.basePath?.let { Paths.get(it) } ?: return
        if (Pijul.isUnderPijul(path)) {
            val hasPijul = findBinaryOrNull("pijul") != null
            val hasEditorServer = findBinaryOrNull("editor-server") != null
            if (!hasPijul) {
                val hasCargo = findBinaryOrNull("cargo") != null
                if (!hasCargo) {
                    this.askForCargoInstallation(project, "pijul").handle { t, u ->
                        if (t != null && checkForCargo(project)) {
                            cargoInstallPijul(project)
                        }
                        if (u != null) {
                            warnDraconWillNotWork(project)
                            u.printStackTrace()
                        }
                    }
                } else {
                    cargoInstallPijul(project)
                }
            }
            if (!hasEditorServer) {
                val hasCargo = findBinaryOrNull("cargo") != null
                if (!hasCargo) {
                    this.askForCargoInstallation(project, "editor-server").handle { t, u ->
                        if (t != null && checkForCargo(project)) {
                            cargoInstallEditor(project)
                        }
                        if (u != null) {
                            warnDraconWillNotWork(project)
                            u.printStackTrace()
                        }
                    }
                } else {
                    cargoInstallEditor(project)
                }
            }
        }
    }
    fun cargoInstallPijul(project: Project) {
        val dialog = Messages.showYesNoDialog(
            project,
            DraconBundle.message("install.pijul.text").wrapInHml(),
            DraconBundle.message("install.pijul.title2"),
            Messages.getWarningIcon()
        )
        if (dialog == Messages.YES) {
            object : Task.Backgroundable(project, DraconBundle.message("install.pijul.title")) {
                override fun run(indicator: ProgressIndicator) {
                    indicator.isIndeterminate = true
                    indicator.text = DraconBundle.message("install.pijul.title")
                    indicator.text2 = DraconBundle.message("install.cargo.running.text")
                    execInTerminal("install.pijul.title", "cargo install pijul --version '~1.0.0-alpha'")
                }
            }.queue()
        } else {
            warnDraconWillNotWork(project)
        }
    }
    fun cargoInstallEditor(project: Project) {
        val dialog = Messages.showYesNoDialog(
            project,
            DraconBundle.message("install.editor.server.text").wrapInHml(),
            DraconBundle.message("install.editor.server.title2"),
            Messages.getWarningIcon()
        )
        if (dialog == Messages.YES) {
            object : Task.Backgroundable(project, DraconBundle.message("install.editor.server.title")) {
                override fun run(indicator: ProgressIndicator) {
                    indicator.isIndeterminate = true
                    indicator.text = DraconBundle.message("install.editor.server.title")
                    indicator.text2 = DraconBundle.message("install.cargo.running.text")
                    execInTerminal("install.editor.server.title", "cargo install editor-server")
                }
            }.queue()
        } else {
            warnDraconWillNotWork(project)
        }
    }
    fun checkForCargo(project: Project): Boolean {
        if (findBinaryOrNull("cargo") == null) {
            warnDraconWillNotWork(project)
            return false
        }
        return true
    }
    fun warnDraconWillNotWork(project: Project) {
        Messages.showWarningDialog(
            project,
            DraconBundle.message("install.pijul.warning.text").wrapInHml(),
            DraconBundle.message("install.pijul.title")
        )
    }
    fun askForCargoInstallation(project: Project, sub: String): CompletableFuture<Unit> {
        val dialog = Messages.showYesNoDialog(
            project,
            DraconBundle.message("install.cargo.text", sub.escapeXml()).wrapInHml(),
            DraconBundle.message("install.cargo.title"),
            Messages.getWarningIcon()
        )
        if (dialog == Messages.YES) {
            val download = if (SystemInfo.isWindows) {
                DownloadableFileService.getInstance().createDownloader(listOf(
                    DownloadableFileService.getInstance()
                        .createFileDescription(
                            "https://win.rustup.rs/x86_64",
                            "rustup-init.exe"
                        )
                ), "Rustup")
            } else {
                DownloadableFileService.getInstance().createDownloader(listOf(
                    DownloadableFileService.getInstance()
                        .createFileDescription(
                            "https://sh.rustup.rs",
                            "rustup-init.sh"
                        )
                ), "Rustup")
            }
            return download.downloadWithBackgroundProgress(null, project)
                .handle { t, u ->
                    if (t != null && t.isNotEmpty()) {
                        val file = Paths.get(VcsUtil.getFilePath(t.single().first).path).toAbsolutePath()
                        if (SystemInfo.isWindows) {
                            this.execInTerminal("install.cargo.title", file.toString())
                        } else {
                            this.execInTerminal("install.cargo.title", "sh $file")
                        }
                    }
                    u?.printStackTrace()
                }
        } else {
            return CompletableFuture.failedFuture(IllegalStateException("User not accepted cargo installation."))
        }
    }
    fun execInTerminal(
        @PropertyKey(resourceBundle = BUNDLE) name: String,
        command: String
    ) {
        ExecUtil.execAndGetOutput(GeneralCommandLine(ExecUtil.getTerminalCommand(DraconBundle.message(name), command)))
    }
}

File addition: PijulInvalidateCaches.kt (----------)

[7.18106]

/**
 * Dracon - An IntelliJ-Pijul integration.
 * Copyright 2021 JonathanxD <jhrldev@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
package com.github.jonathanxd.dracon.actions
import com.github.jonathanxd.dracon.cache.FileRevisionCache
import com.github.jonathanxd.dracon.cache.FileStatusCache
import com.github.jonathanxd.dracon.cache.PijulLogEntryCache
import com.github.jonathanxd.dracon.cache.PijulLogEntryChangeCache
import com.github.jonathanxd.dracon.i18n.DraconBundle
import com.github.jonathanxd.dracon.pijul.NonZeroExitStatusCode
import com.github.jonathanxd.dracon.pijul.Pijul
import com.github.jonathanxd.dracon.pijul.pijul
import com.github.jonathanxd.dracon.util.wrapInHml
import com.github.jonathanxd.dracon.vcs.DraconVcsUtil
import com.github.jonathanxd.dracon.vcs.NotificationIds
import com.github.jonathanxd.dracon.vfs.DraconVfsUtil
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.components.service
import com.intellij.openapi.fileChooser.FileChooser
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.Task
import com.intellij.openapi.project.DumbAwareAction
import com.intellij.openapi.project.ProjectManager
import com.intellij.openapi.ui.Messages
import com.intellij.openapi.vcs.ProjectLevelVcsManager
import com.intellij.openapi.vcs.VcsNotifier
import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager
import com.intellij.vcsUtil.VcsUtil
class PijulInvalidateCaches: DumbAwareAction() {
    override fun actionPerformed(e: AnActionEvent) {
        val project = e.getData(CommonDataKeys.PROJECT) ?: ProjectManager.getInstance().defaultProject
        object : Task.Backgroundable(project, DraconBundle.Dracon.refreshing) {
            override fun run(indicator: ProgressIndicator) {
                indicator.isIndeterminate = false
                indicator.text = DraconBundle.message("cache.invalidate.text")
                indicator.fraction = 0.0
                val fileRevisionCache = project.service<FileRevisionCache>()
                indicator.text2 = DraconBundle.message("cache.invalidate.current.text", "file revision cache")
                fileRevisionCache.invalidate()
                indicator.fraction = 0.25
                val fileStatusCache = project.service<FileStatusCache>()
                indicator.text2 = DraconBundle.message("cache.invalidate.current.text", "file status cache")
                fileStatusCache.invalidate()
                indicator.fraction = 0.50
                val logEntryCache = project.service<PijulLogEntryCache>()
                indicator.text2 = DraconBundle.message("cache.invalidate.current.text", "pijul log entry cache")
                logEntryCache.invalidate()
                indicator.fraction = 0.75
                val logEntryChangeCache = project.service<PijulLogEntryChangeCache>()
                indicator.text2 = DraconBundle.message("cache.invalidate.current.text", "pijul log entry changes cache")
                logEntryChangeCache.invalidate()
                indicator.fraction = 1.0
                indicator.text2 = DraconBundle.message("cache.invalidate.finish.text")
            }
        }.queue()
    }
}

Add auto installation support and cache content of ContentRevision

Dependencies

In channels

Change contents

Insertion in src/main/resources/messages/DraconBundle.properties at line 19 [5.105]

Replacement in src/main/resources/messages/DraconBundle.properties at line 42 [5.105]

Insertion in src/main/resources/META-INF/plugin.xml at line 31 [5.1490]

Insertion in src/main/resources/META-INF/plugin.xml at line 42 [5.1490]

Insertion in src/main/resources/META-INF/plugin.xml at line 71 [5.1490]

Deletion in src/main/resources/META-INF/plugin.xml at line 75 [5.1490]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 9 [6.204]

Deletion in src/main/kotlin/com/github/jonathanxd/dracon/util/Application.kt at line 41 [6.204]

File move: listeners (----------) → listeners (d--x------)

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 3 [8.5035]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 5 [8.5035]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 21 [8.5035]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/content/PijulContentRevision.kt at line 24 [8.5035]

Replacement in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 61 [7.10972]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cmd/PijulCmd.kt at line 256 [7.10972]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryChangeCache.kt at line 54 [2.14446]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryCache.kt at line 6 [11.11397]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryCache.kt at line 10 [11.11397]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/PijulLogEntryCache.kt at line 21 [11.11397]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/FileStatusCache.kt at line 64 [2.17169]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/FileRevisionCache.kt at line 3 [2.20156]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/FileRevisionCache.kt at line 32 [2.20156]

Insertion in src/main/kotlin/com/github/jonathanxd/dracon/cache/DataCache.kt at line 138 [2.21452]

File addition: activity (----------)

File addition: PijulPostStartupActivity.kt (----------)

File addition: PijulInvalidateCaches.kt (----------)