Bläddra i källkod

fix: git sync untracked

Nick 5 år sedan
förälder
incheckning
454da698a1
3 ändrade filer med 15 tillägg och 9 borttagningar
  1. 13 0
      server/helpers/page.js
  2. 1 8
      server/models/pages.js
  3. 1 1
      server/modules/storage/git/storage.js

+ 13 - 0
server/helpers/page.js

@@ -89,5 +89,18 @@ module.exports = {
     } else {
       return false
     }
+  },
+  /**
+   * Get file extension from content type
+   */
+  getFileExtension(contentType) {
+    switch (contentType) {
+      case 'markdown':
+        return 'md'
+      case 'html':
+        return 'html'
+      default:
+        return 'txt'
+    }
   }
 }

+ 1 - 8
server/models/pages.js

@@ -159,14 +159,7 @@ module.exports = class Page extends Model {
    * @returns {string} File Extension
    */
   getFileExtension() {
-    switch (this.contentType) {
-      case 'markdown':
-        return 'md'
-      case 'html':
-        return 'html'
-      default:
-        return 'txt'
-    }
+    return pageHelper.getFileExtension(this.contentType)
   }
 
   /**

+ 1 - 1
server/modules/storage/git/storage.js

@@ -349,7 +349,7 @@ module.exports = {
       new stream.Transform({
         objectMode: true,
         transform: async (page, enc, cb) => {
-          let fileName = `${page.path}.${page.getFileExtension()}`
+          let fileName = `${page.path}.${pageHelper.getFileExtension(page.contentType)}`
           if (WIKI.config.lang.namespacing && WIKI.config.lang.code !== page.localeCode) {
             fileName = `${page.localeCode}/${fileName}`
           }