pinokiod 3.343.0 → 5.0.1

package/server/index.js

@@ -27,6 +27,7 @@ const crypto = require('crypto')
 const system = require('systeminformation')
 const serveIndex = require('./serveIndex')
 const registerFileRoutes = require('./routes/files')
+const Git = require("../kernel/git")
 const TerminalApi = require('../kernel/api/terminal')
 
 const git = require('isomorphic-git')
@@ -180,68 +181,10 @@ class Server {
   }
 
   async ensureGitconfigDefaults(home) {
-    const gitconfigPath = path.resolve(home, "gitconfig")
-    const templatePath = path.resolve(__dirname, "..", "kernel", "gitconfig_template")
-    const defaultName = "pinokio"
-    const defaultEmail = "pinokio@localhost"
-    const hasEmailShape = (value) => typeof value === "string" && value.includes("@")
-    const required = [
-      { section: "init", key: "defaultBranch", value: "main" },
-      { section: "push", key: "autoSetupRemote", value: true },
-    ]
-
-    const exists = await this.kernel.exists(gitconfigPath)
-    if (!exists) {
-      await fs.promises.copyFile(templatePath, gitconfigPath)
-      return
-    }
-
-    let config
-    let dirty = false
-    try {
-      const content = await fs.promises.readFile(gitconfigPath, "utf8")
-      config = ini.parse(content)
-    } catch (e) {
-      config = {}
-      dirty = true
-    }
-
-    for (const { section, key, value } of required) {
-      if (!config[section]) {
-        config[section] = {}
-      }
-      const current = config[section][key]
-      if (String(current) !== String(value)) {
-        config[section][key] = value
-        dirty = true
-      }
-    }
-
-    if (!config.user) {
-      config.user = {}
-    }
-    const name = (typeof config.user.name === "string") ? config.user.name : ""
-    if (!name.trim()) {
-      config.user.name = defaultName
-      dirty = true
-    }
-    const email = (typeof config.user.email === "string") ? config.user.email.trim() : ""
-    if (!hasEmailShape(email)) {
-      config.user.email = defaultEmail
-      dirty = true
-    } else if (email !== config.user.email) {
-      config.user.email = email
-      dirty = true
-    }
-
-    if (config['credential "helperselector"']) {
-      delete config['credential "helperselector"']
-      dirty = true
-    }
-
-    if (dirty) {
-      await fs.promises.writeFile(gitconfigPath, ini.stringify(config))
+    if (!this.kernel.git) {
+      this.kernel.git = new Git(this.kernel)
     }
+    await this.kernel.git.ensureDefaults(home)
   }
   async handleFatalError(error, origin) {
     if (this.handlingFatalError) {

package/server/public/htmlmodal.js

@@ -272,6 +272,18 @@
       if (Array.isArray(payload.actions)) {
         this.renderActions(payload.actions)
       }
+      if (Object.prototype.hasOwnProperty.call(payload, 'actionsAlign')) {
+        const align = payload.actionsAlign
+        if (align === 'end') {
+          this.actions.style.justifyContent = 'flex-end'
+        } else if (align === 'center') {
+          this.actions.style.justifyContent = 'center'
+        } else {
+          this.actions.style.justifyContent = 'flex-start'
+        }
+      } else {
+        this.actions.style.justifyContent = 'flex-start'
+      }
       if (Object.prototype.hasOwnProperty.call(payload, 'dismissible')) {
         this.current.dismissible = Boolean(payload.dismissible)
         this.closeBtn.style.display = this.current.dismissible ? 'inline-flex' : 'none'