mirror of
https://github.com/end-4/dots-hyprland.git
synced 2026-06-05 14:59:27 -05:00
fix(ii): add Konachan support in sidebar
This commit is contained in:
@@ -16,9 +16,20 @@ Process {
|
||||
return StringUtils.shellSingleQuoteEscape(FileUtils.trimFileProtocol(filePath));
|
||||
}
|
||||
|
||||
function processSourceUrl() {
|
||||
return StringUtils.shellSingleQuoteEscape(sourceUrl);
|
||||
}
|
||||
|
||||
function curlUserAgentArg() {
|
||||
if (!downloadUserAgent) {
|
||||
return "";
|
||||
}
|
||||
return ` -H 'User-Agent: ${StringUtils.shellSingleQuoteEscape(downloadUserAgent)}'`;
|
||||
}
|
||||
|
||||
running: true
|
||||
command: ["bash", "-c",
|
||||
`mkdir -p $(dirname '${processFilePath()}'); [ -f '${processFilePath()}' ] || curl -sSL '${sourceUrl}' -o '${processFilePath()}' && file '${processFilePath()}'`
|
||||
`mkdir -p $(dirname '${processFilePath()}'); [ -f '${processFilePath()}' ] || curl -sSL '${processSourceUrl()}'${curlUserAgentArg()} -o '${processFilePath()}' && file '${processFilePath()}'`
|
||||
]
|
||||
stdout: StdioCollector {
|
||||
id: imageSizeOutputCollector
|
||||
|
||||
@@ -174,8 +174,10 @@ Button {
|
||||
onClicked: {
|
||||
root.showActions = false;
|
||||
const targetPath = root.imageData.is_nsfw ? root.nsfwPath : root.downloadPath;
|
||||
const userAgent = Config.options?.networking?.userAgent ?? ""
|
||||
const userAgentHeader = userAgent ? ` -H 'User-Agent: ${StringUtils.shellSingleQuoteEscape(userAgent)}'` : ""
|
||||
Quickshell.execDetached(["bash", "-c",
|
||||
`mkdir -p '${targetPath}' && curl '${root.imageData.file_url}' -o '${targetPath}/${root.fileName}' && notify-send '${Translation.tr("Download complete")}' '${root.downloadPath}/${root.fileName}' -a 'Shell'`
|
||||
`mkdir -p '${targetPath}' && curl '${StringUtils.shellSingleQuoteEscape(root.imageData.file_url)}'${userAgentHeader} -o '${targetPath}/${root.fileName}' && notify-send '${Translation.tr("Download complete")}' '${root.downloadPath}/${root.fileName}' -a 'Shell'`
|
||||
])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -230,7 +230,7 @@ Rectangle {
|
||||
rowHeight: imageRow.rowHeight
|
||||
imageRadius: imageRow.modelData.images.length == 1 ? 50 : Appearance.rounding.normal
|
||||
// Download manually to reduce redundant requests or make sure downloading works
|
||||
manualDownload: ["danbooru", "waifu.im", "t.alcy.cc"].includes(root.responseData.provider)
|
||||
manualDownload: ["danbooru", "waifu.im", "t.alcy.cc", "konachan"].includes(root.responseData.provider)
|
||||
previewDownloadPath: root.previewDownloadPath
|
||||
downloadPath: root.downloadPath
|
||||
nsfwPath: root.nsfwPath
|
||||
|
||||
@@ -406,8 +406,8 @@ Singleton {
|
||||
}
|
||||
|
||||
try {
|
||||
// Required for danbooru
|
||||
if (currentProvider == "danbooru") {
|
||||
// Required for danbooru and konachan
|
||||
if (["danbooru", "konachan"].includes(currentProvider)) {
|
||||
xhr.setRequestHeader("User-Agent", defaultUserAgent)
|
||||
}
|
||||
else if (currentProvider == "zerochan") {
|
||||
@@ -458,8 +458,8 @@ Singleton {
|
||||
}
|
||||
|
||||
try {
|
||||
// Required for danbooru
|
||||
if (currentProvider == "danbooru") {
|
||||
// Required for danbooru and konachan
|
||||
if (["danbooru", "konachan"].includes(currentProvider)) {
|
||||
xhr.setRequestHeader("User-Agent", defaultUserAgent)
|
||||
}
|
||||
xhr.send()
|
||||
|
||||
Reference in New Issue
Block a user