Skip to content

Commit

Permalink
fix: If excludedFolder is empty, no file is shared
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mara-Li
Mara-Li committed Apr 15, 2022
1 parent 1ab79c1 commit f55d950
Show file tree
Hide file tree
Showing 2 changed files with 140 additions and 137 deletions.
275 changes: 139 additions & 136 deletions mkdocsPublisher/utils/publication.ts
View file
Original file line number Diff line number Diff line change
@@ -1,180 +1,183 @@
// Credit : https://github.com/oleeskild/obsidian-digital-garden @oleeskild

import { MetadataCache, Vault, TFile, Notice } from 'obsidian'
import {
mkdocsPublicationSettings
} from '../settings'
import { Octokit } from '@octokit/core'
import { arrayBufferToBase64 } from './utils'
import { Base64 } from 'js-base64'
import {MetadataCache, Notice, TFile, Vault} from 'obsidian'
import {mkdocsPublicationSettings} from '../settings'
import {Octokit} from '@octokit/core'
import {arrayBufferToBase64} from './utils'
import {Base64} from 'js-base64'

export default class MkdocsPublish {
vault: Vault;
metadataCache: MetadataCache;
settings: mkdocsPublicationSettings;

constructor (vault: Vault, metadataCache: MetadataCache, settings: mkdocsPublicationSettings) {
this.vault = vault
this.metadataCache = metadataCache
this.settings = settings
constructor(vault: Vault, metadataCache: MetadataCache, settings: mkdocsPublicationSettings) {
this.vault = vault
this.metadataCache = metadataCache
this.settings = settings
}

async getSharedFiles () {
const files = this.vault.getMarkdownFiles()
const shared_File = []
const sharedkey = this.settings.shareKey
for (const file of files) {
try {
const frontMatter = this.metadataCache.getCache(file.path).frontmatter
if (frontMatter && frontMatter[sharedkey] === true) {
shared_File.push(file)
}
} catch {
// ignore
}
}
return shared_File
const files = this.vault.getMarkdownFiles()
const shared_File = []
const sharedkey = this.settings.shareKey
for (const file of files) {
try {
const frontMatter = this.metadataCache.getCache(file.path).frontmatter
if (frontMatter && frontMatter[sharedkey] === true) {
shared_File.push(file)
}
} catch {
// ignore
}
}
return shared_File
}

getLinkedImage (file: TFile) {
const embed_files = this.metadataCache.getCache(file.path).embeds
const image_list = []
if (embed_files != undefined) {
for (const embed_file of embed_files) {
const imageLink = this.metadataCache.getFirstLinkpathDest(embed_file.link, file.path)
const imgExt = imageLink.extension
const regImg = /(png|jpe?g|svg|bmp|gif)$/i
if (imgExt.match(regImg)) {
image_list.push(imageLink)
}
}
return image_list
}
return []
const embed_files = this.metadataCache.getCache(file.path).embeds
const image_list = []
if (embed_files != undefined) {
for (const embed_file of embed_files) {
const imageLink = this.metadataCache.getFirstLinkpathDest(embed_file.link, file.path)
const imgExt = imageLink.extension
const regImg = /(png|jpe?g|svg|bmp|gif)$/i
if (imgExt.match(regImg)) {
image_list.push(imageLink)
}
}
return image_list
}
return []
}

checkExcludedFolder (file: TFile) {
const excluded_folder = this.settings.ExcludedFolder.split('/')
for (let i = 0; i < excluded_folder.length; i++) {
if (file.path.contains(excluded_folder[i].trim())) {
return true
}
}
return false
const excluded_folder = this.settings.ExcludedFolder.split(',').filter(x=>x!='')
console.log(excluded_folder.length)
if (excluded_folder.length > 0) {
for (let i = 0; i < excluded_folder.length; i++) {
if (file.path.contains(excluded_folder[i].trim())) {
return true
}
}
}
return false
}

async publish (file: TFile, one_file = false) {
const sharedkey = this.settings.shareKey
const frontmatter = this.metadataCache.getCache(file.path).frontmatter
if (!frontmatter || !frontmatter[sharedkey] || this.checkExcludedFolder(file)) {
return false
}
try {
const text = await this.vault.cachedRead(file)
const linked_image = this.getLinkedImage(file)
await this.uploadText(file.path, text, file.name)
if (linked_image.length > 0) {
for (const image of linked_image) {
await this.uploadImage(image)
}
}
if (one_file) {
await this.uploadFolder()
}
return true
} catch (e) {
console.log(e)
return false
}
const sharedkey = this.settings.shareKey
const frontmatter = this.metadataCache.getCache(file.path).frontmatter
if (!frontmatter || !frontmatter[sharedkey] || this.checkExcludedFolder(file)) {
return false
}
try {
const text = await this.vault.cachedRead(file)
const linked_image = this.getLinkedImage(file)
await this.uploadText(file.path, text, file.name)
if (linked_image.length > 0) {
for (const image of linked_image) {
await this.uploadImage(image)
}
}
if (one_file) {
await this.uploadFolder()
}
return true
} catch (e) {
console.log(e)
return false
}
}

async uploadFolder () {
const folder = await this.getSharedFiles()
if (folder.length > 0) {
const publishedFiles = folder.map(file => file.name)
const publishedFilesText = publishedFiles.toString()
await this.uploadText('vault_published.txt', publishedFilesText, 'vault_published.txt')
}
const folder = await this.getSharedFiles()
if (folder.length > 0) {
const publishedFiles = folder.map(file => file.name)
const publishedFilesText = publishedFiles.toString()
await this.uploadText('vault_published.txt', publishedFilesText, 'vault_published.txt')
}
}

async upload (filePath: string, content: string, title: string) {
if (!this.settings.githubRepo) {
new Notice('Config error : You need to define a github repo in the plugin settings')
throw {}
}
if (!this.settings.githubName) {
new Notice('Config error : You need to define your github username in the plugin settings')
throw {}
}
const octokit = new Octokit({
auth: this.settings.GhToken
})
const path = `source/${title}`
if (!this.settings.githubRepo) {
new Notice('Config error : You need to define a github repo in the plugin settings')
throw {}
}
if (!this.settings.githubName) {
new Notice('Config error : You need to define your github username in the plugin settings')
throw {}
}
const octokit = new Octokit({
auth: this.settings.GhToken
})
const path = `source/${title}`

const payload = {
owner: this.settings.githubName,
repo: this.settings.githubRepo,
path,
message: `Adding ${title}`,
content: content,
sha: ''
}
try {
const response = await octokit.request('GET /repos/{owner}/{repo}/contents/{path}', {
owner: this.settings.githubName,
repo: this.settings.githubRepo,
path
})
// @ts-ignore
if (response.status === 200 && response.data.type === 'file') {
// @ts-ignore
payload.sha = response.data.sha
}
} catch (e) {
console.log(e)
}
payload.message = `Update note ${title}`
await octokit.request('PUT /repos/{owner}/{repo}/contents/{path}', payload)
const payload = {
owner: this.settings.githubName,
repo: this.settings.githubRepo,
path,
message: `Adding ${title}`,
content: content,
sha: ''
}
try {
const response = await octokit.request('GET /repos/{owner}/{repo}/contents/{path}', {
owner: this.settings.githubName,
repo: this.settings.githubRepo,
path
})
// @ts-ignore
if (response.status === 200 && response.data.type === 'file') {
// @ts-ignore
payload.sha = response.data.sha
}
} catch (e) {
console.log(e)
}
payload.message = `Update note ${title}`
await octokit.request('PUT /repos/{owner}/{repo}/contents/{path}', payload)
}

async uploadImage (imageFile:TFile) {
const imageBin = await this.vault.readBinary(imageFile)
const image64 = arrayBufferToBase64(imageBin)
await this.upload(imageFile.path, image64, imageFile.name)
const imageBin = await this.vault.readBinary(imageFile)
const image64 = arrayBufferToBase64(imageBin)
await this.upload(imageFile.path, image64, imageFile.name)
}

async uploadText (filePath: string, text: string, title = '') {
try {
const contentBase64 = Base64.encode(text).toString()
await this.upload(filePath, contentBase64, title)
} catch (e) {
console.log(e)
}
try {
const contentBase64 = Base64.encode(text).toString()
await this.upload(filePath, contentBase64, title)
} catch (e) {
console.log(e)
}
}

async workflow_gestion () {
const octokit = new Octokit({
auth: this.settings.GhToken
})
await octokit.request('POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches', {
owner: this.settings.githubName,
repo: this.settings.githubRepo,
workflow_id: 'ci.yml',
ref: 'main'
})
const octokit = new Octokit({
auth: this.settings.GhToken
})
console.log('Gestion workflow')
const req = await octokit.request('POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches', {
owner: this.settings.githubName,
repo: this.settings.githubRepo,
workflow_id: 'ci.yml',
ref: 'main'
})
console.log(req)
}

async updateSettings () {
let newSettings = `index_key=${this.settings.indexFolder}
let newSettings = `index_key=${this.settings.indexFolder}
default_blog=${this.settings.categoryDefault}
category_key=${this.settings.categoryKey}
`
newSettings = newSettings.replace(/\t/gi, '').trim()
try {
await this.uploadText('.github-actions', newSettings, '.github-actions')
return true
} catch {
return false
}
newSettings = newSettings.replace(/\t/gi, '').trim()
try {
await this.uploadText('.github-actions', newSettings, '.github-actions')
return true
} catch {
return false
}
}
}
2 changes: 1 addition & 1 deletion mkdocsPublisher/utils/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function arrayBufferToBase64 (buffer: ArrayBuffer) {
function disablePublish (app: App, settings: mkdocsPublicationSettings, file:TFile) {
const fileCache = app.metadataCache.getFileCache(file)
const meta = fileCache?.frontmatter
const folder_list = settings.ExcludedFolder.split(',')
const folder_list = settings.ExcludedFolder.split(',').filter(x => x!=='')
if (meta === undefined) {
return false
} else if (folder_list.length > 0) {
Expand Down

0 comments on commit f55d950

Please sign in to comment.