Skip to content
Snippets Groups Projects
Unverified Commit 6a45f013 authored by akiraohgaki's avatar akiraohgaki Committed by GitHub
Browse files

Merge pull request #39 from opendesktop/develop 

Develop
parents 3805f3c9 74c97c38
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/configs/application.json
+ 1
− 1
View file @ 6a45f013
{
"id": "ocs-manager",
"name": "ocs-manager",
"version": "0.6.3",
"version": "0.6.4",
"organization": "Opendesktop.org",
"domain": "org.opendesktop.ocs-manager",
"icon": ":/desktop/ocs-manager.svg",
......
app/src/handlers/updatehandler.cpp
+ 16
− 2
View file @ 6a45f013
......@@ -160,14 +160,28 @@ void UpdateHandler::updateAppImage(const QString &itemKey)
metadata["installed_item_obj"] = installedItem;
metadata["new_filename"] = filename;
QString assembledNewFilename = "";
QString rawNewFilename = "";
auto updateInformation = updater->describeAppImage();
for (const auto &info : updateInformation.split("\n")) {
if (info.endsWith(".zsync", Qt::CaseInsensitive)) {
metadata["new_filename"] = info.split("|").last().split("/").last().replace(".zsync", "", Qt::CaseInsensitive);
break;
if (info.startsWith("Assembled ZSync URL:", Qt::CaseInsensitive)) {
assembledNewFilename = info.split("/").last().replace(".zsync", "", Qt::CaseInsensitive);
}
else if (info.startsWith("Raw update information:", Qt::CaseInsensitive)) {
rawNewFilename = info.split("|").last().split("/").last().replace(".zsync", "", Qt::CaseInsensitive);
}
}
}
if (!assembledNewFilename.isEmpty()) {
metadata["new_filename"] = assembledNewFilename;
}
else if (!rawNewFilename.isEmpty() && !rawNewFilename.contains("*")) {
metadata["new_filename"] = rawNewFilename;
}
metadataSet_[itemKey] = metadata;
emit updateStarted(itemKey, true);
......
i18n/messages.en_US.ts
+ 34
− 29
View file @ 6a45f013
......@@ -4,107 +4,112 @@
<context>
<name>ItemHandler</name>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="55"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="53"/>
<source>The item already installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="62"/>
<source>The file already downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="69"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="76"/>
<source>Downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="119"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="125"/>
<source>Invalid OCS-URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="128"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="136"/>
<source>The item not installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="142"/>
<source>Uninstalling</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="197"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="212"/>
<source>Uninstalled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="222"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="237"/>
<source>Downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="252"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="291"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="267"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="311"/>
<source>Saving</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="264"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="306"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="284"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="328"/>
<source>Failed to save data</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="271"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="314"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="291"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="336"/>
<source>Saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="319"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="341"/>
<source>Installing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="330"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="352"/>
<source>The file has been installed as program</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="335"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="357"/>
<source>The plasmoid has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="340"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="362"/>
<source>The plasma look and feel has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="345"/>
<source>The plasma desktop theme has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="350"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="372"/>
<source>The KWin effect has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="355"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="377"/>
<source>The KWin script has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="360"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="382"/>
<source>The KWin window switcher has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="363"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="385"/>
<source>The archive file has been extracted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="366"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="380"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="388"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="402"/>
<source>The file has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="370"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="384"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="392"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="406"/>
<source>Failed to installation</source>
<translation type="unfinished"></translation>
</message>
......
i18n/messages.ts
+ 34
− 29
View file @ 6a45f013
......@@ -4,107 +4,112 @@
<context>
<name>ItemHandler</name>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="55"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="53"/>
<source>The item already installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="62"/>
<source>The file already downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="69"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="76"/>
<source>Downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="119"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="125"/>
<source>Invalid OCS-URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="128"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="136"/>
<source>The item not installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="142"/>
<source>Uninstalling</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="197"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="212"/>
<source>Uninstalled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="222"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="237"/>
<source>Downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="252"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="291"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="267"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="311"/>
<source>Saving</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="264"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="306"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="284"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="328"/>
<source>Failed to save data</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="271"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="314"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="291"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="336"/>
<source>Saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="319"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="341"/>
<source>Installing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="330"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="352"/>
<source>The file has been installed as program</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="335"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="357"/>
<source>The plasmoid has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="340"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="362"/>
<source>The plasma look and feel has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="345"/>
<source>The plasma desktop theme has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="350"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="372"/>
<source>The KWin effect has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="355"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="377"/>
<source>The KWin script has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="360"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="382"/>
<source>The KWin window switcher has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="363"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="385"/>
<source>The archive file has been extracted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="366"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="380"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="388"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="402"/>
<source>The file has been installed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../app/src/handlers/itemhandler.cpp" line="370"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="384"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="392"/>
<location filename="../app/src/handlers/itemhandler.cpp" line="406"/>
<source>Failed to installation</source>
<translation type="unfinished"></translation>
</message>
......
pkg/appimage/appimagebuild
+ 1
− 1
View file @ 6a45f013
#!/bin/bash
PKGNAME='ocs-manager'
PKGVER='0.6.3'
PKGVER='0.6.4'
PKGREL='1'
curl -fsSL -o linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment