|
[-]
[+]
|
Changed |
_service:tar_git:install-history.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://codeberg.org/nephros/install-history</param>
<param name="branch"></param>
- <param name="revision">0.9.15</param>
+ <param name="revision">0.9.16</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/qml/pages/MainPage.qml
^
|
| @@ -29,6 +29,7 @@
allowedOrientations: Orientation.All
property bool unclutter: false
+ property bool showLocal: true
property string historyfile: "/var/log/zypp/history"
Connections {
@@ -143,8 +144,14 @@
flickable: flick
MenuItem { text: qsTr("Refresh");
// refresh on delayedclick otherwise the bounce animation freezes while we reload
- onClicked: { appHistoryModel.clear(); view.forceLayout(); }
- onDelayedClick: { getHistory(page.historyfile); }
+ //onClicked: { appHistoryModel.clear(); view.forceLayout(); }
+ onClicked: { appHistoryModel.clear(); view.forceLayout(); view.model = null; }
+ onDelayedClick: { getHistory(page.historyfile,showLocal); view.model = appHistoryModel }
+ }
+ MenuItem { text: showLocal ? qsTr("Hide local") : qsTr("Show local") ;
+ // refresh on delayedclick otherwise the bounce animation freezes while we reload
+ onClicked: { showLocal = !showLocal; appHistoryModel.clear(); view.forceLayout(); view.model = null; }
+ onDelayedClick: { getHistory(page.historyfile,showLocal); view.model = appHistoryModel }
}
MenuItem { text: page.unclutter ? qsTr("Verbose Display") : qsTr("Reduced Display") ;
onClicked: page.unclutter = !page.unclutter
@@ -351,7 +358,7 @@
}
// repo
Label{ visible: ( install && !li.unclutter )
- text: repo ; horizontalAlignment: install ? Text.AlignLeft : Text.AlignRight; color: Theme.highlightBackgroundColor; font.pixelSize: Theme.fontSizeSmall}
+ text: repoName ; horizontalAlignment: install ? Text.AlignLeft : Text.AlignRight; color: Theme.highlightBackgroundColor; font.pixelSize: Theme.fontSizeSmall}
}
}
}
@@ -361,7 +368,7 @@
}
}
- ListModel { id: appHistoryModel; Component.onCompleted: { getHistory(page.historyfile); } }
+ ListModel { id: appHistoryModel; Component.onCompleted: { getHistory(page.historyfile,showLocal); } }
Component{ id: datePicker; DatePickerDialog {} }
@@ -376,7 +383,7 @@
/* ----- functions ----- */
/* load zypper history log file */
- function getHistory(fn) {
+ function getHistory(fn,filter) {
console.assert((typeof fn !== "undefined"), "Called without filename");
console.info("Loading history from " + fn);
console.time("File request took");
@@ -388,7 +395,7 @@
r.onreadystatechange = function(event) {
if (r.readyState == XMLHttpRequest.DONE) {
- fillModel(r.response.split("\n").reverse());
+ fillModel(r.response.split("\n").reverse(),filter);
console.timeEnd("File request took");
}
}
@@ -405,12 +412,18 @@
const re = /^20.{17}(\|install|\|remove).*$/;
return (re.test(data)) ? true : false;
}
+ function filterLocal(data) {
+ const re = /\|PK_TMP_DIR\|/
+ return (!re.test(data)) ? true : false;
+ }
/* populate ListModel from payload */
- function fillModel(a) {
+ function fillModel(a,filter) {
console.time("List loaded in");
console.time("Filtering took");
const data = a.filter(filterData);
+ if (!filter)
+ const data = data.filter(filterLocal);
console.timeEnd("Filtering took");
console.debug("Filtered Lines: " + data.length + "/" + a.length);
// performance: compile regexp and define and loop variables
@@ -425,6 +438,7 @@
const dateTime;
const repo;
const repotype = "other";
+ const reponame = null;
const element = {};
data.forEach(function(r){
line = r.split("|");
@@ -433,18 +447,71 @@
// see https://codeberg.org/nephros/install-history/issues/16
dt = line[0].split(" ");
d = dt[0].split("-"); t = dt[1].split(":");
- dateTime = new Date( d[0], d[1], d[2], t[0], t[1], t[2]);
+ dateTime = new Date( d[0], d[1], d[2], t[0], t[1], t[2], 0);
+ /* assign pretty names:
+ *
+ grep install /var/log/zypp/history |grep -v PK_TMP_DIR | awk -F\| '{print $7}'| sort -u | grep -v openrepos
+
+ adaptation0
+ adaptation1
+ aliendalvik
+ customer-jolla
+ harbour-storeman-obs
+ mentaljam-obs
+ sailfish-eas
+ sailfishos-chum
+ sailfishos-chum-testing
+ store
+ xt9
+ */
repo = line[6];
+ reponame = repo;
if (repo === "PK_TMP_DIR") {
repo=qsTr("local", "name for a local repo");
+ reponame=qsTr("local", "name for a local repo");
repotype="local";
+ } else if (repo === "store") {
+ reponame=qsTr("Jolla Store", "name for the jolla store repo");
+ repotype="jolla";
+ } else if (repo === "jolla") {
+ reponame=qsTr("Jolla System", "name for the jolla jolla repo");
+ repotype="jolla";
+ } else if (repo === "aliendalvik") {
+ reponame=qsTr("Android App Support", "name for the android support repo");
+ repotype="jolla";
+ } else if (repo === "apps") {
+ reponame=qsTr("Jolla Applications", "name for the jolla apps repo");
+ repotype="jolla";
+ } else if (repo === "sailfish-eas") {
+ reponame=qsTr("Exchange Feature", "name for the jolla feature repo");
+ repotype="jolla";
+ } else if (repo === "xt9") {
+ reponame=qsTr("XT9 Feature", "name for the jolla feature repo");
+ repotype="jolla";
+ } else if (repo === "customer-jolla") {
+ reponame=qsTr("Jolla Feature", "name for the jolla customer repo");
+ repotype="jolla";
+ } else if (repo === "adaptation0") {
+ reponame=qsTr("Device Adaptation", "name for the jolla adaptation0 repo");
+ repotype="jolla";
+ } else if (repo === "adaptation1") {
+ reponame=qsTr("Device Adaptation", "name for the jolla adaptation1 repo");
+ repotype="jolla";
+ } else if ( (repo === "mentaljam-obs") || (repo === "harbour-storeman-obs") ) {
+ reponame=qsTr("Storeman", "name for the storeman repo");
} else if (repo === "sailfishos-chum") {
+ reponame=qsTr("SailfishOS:Chum", "name for the chum repo");
+ repotype="chum";
+ } else if (repo === "sailfishos-chum-testing") {
+ reponame=qsTr("SailfishOS:Chum Testing", "name for the chum testing repo");
repotype="chum";
+ } else if (repo === "nubecula-mls-offline-repo") {
+ reponame=qsTr("MLS", "name for the Nubecula Offline MLS repo");
} else if ( isOpenrepos.test(repo) ) {
+ reponame= qsTr("OpenRepos: %1", "prefix for a openrepos repo").arg(repo.replace("openrepos-", ""));
repotype="openrepos";
}
-
element = {
"date": dt[0],
"dateTime": dateTime,
@@ -452,6 +519,7 @@
"appName": line[2],
"version": line[3],
"repo": repo,
+ "repoName": reponame,
"repoType": repotype,
}
appHistoryModel.append(element);
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/qml/pages/StatsPage.qml
^
|
| @@ -66,7 +66,7 @@
onStatusChanged: {
if ( status === PageStatus.Active) {
- if( repoModel.count <= 0 ) { fillModel(repoModel, "install", "repo", 10)}
+ if( repoModel.count <= 0 ) { fillModel(repoModel, "install", "repoName", 10)}
if( packageModel.count <= 0 ) { fillModel(packageModel, "install", "appName", 10)}
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/settings/translations/settings-install-history-entry-de.ts
^
|
| @@ -7,7 +7,7 @@
<location filename="../entries/translation.qml" line="5"/>
<source>Install History</source>
<extracomment>app name in the settings</extracomment>
- <translation>Installationsverlauf</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/settings/translations/settings-install-history-entry-en.ts
^
|
| @@ -7,7 +7,7 @@
<location filename="../entries/translation.qml" line="5"/>
<source>Install History</source>
<extracomment>app name in the settings</extracomment>
- <translation>Install History</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/settings/translations/settings-install-history-entry-ru.ts
^
|
| @@ -7,7 +7,7 @@
<location filename="../entries/translation.qml" line="5"/>
<source>Install History</source>
<extracomment>app name in the settings</extracomment>
- <translation>История установки пакетов</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/settings/translations/settings-install-history-entry-sv.ts
^
|
| @@ -7,7 +7,7 @@
<location filename="../entries/translation.qml" line="5"/>
<source>Install History</source>
<extracomment>app name in the settings</extracomment>
- <translation>Installationshistorik</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/translations/settings-install-history-de.ts
^
|
| @@ -129,6 +129,84 @@
<source>Loading…</source>
<translation>Laden, laden, laden…</translation>
</message>
+ <message>
+ <source>Hide local</source>
+ <translation>Lokale verbergen</translation>
+ </message>
+ <message>
+ <source>Show local</source>
+ <translation>Lokale anzeigen</translation>
+ </message>
+ <message>
+ <source>Jolla Store</source>
+ <comment>name for the jolla store repo</comment>
+ <translation>Jolla Store</translation>
+ </message>
+ <message>
+ <source>Jolla System</source>
+ <comment>name for the jolla jolla repo</comment>
+ <translation>Jolla system</translation>
+ </message>
+ <message>
+ <source>Android App Support</source>
+ <comment>name for the android support repo</comment>
+ <translation>Android Unterstützung</translation>
+ </message>
+ <message>
+ <source>Jolla Applications</source>
+ <comment>name for the jolla apps repo</comment>
+ <translation>Jolla Programme</translation>
+ </message>
+ <message>
+ <source>Exchange Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation>Exchange Feature</translation>
+ </message>
+ <message>
+ <source>XT9 Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation>XT9 Feature</translation>
+ </message>
+ <message>
+ <source>Jolla Feature</source>
+ <comment>name for the jolla customer repo</comment>
+ <translation>Jolla Feature</translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation0 repo</comment>
+ <translation>Geräte-Adaption</translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation1 repo</comment>
+ <translation>Geräte-Adaption</translation>
+ </message>
+ <message>
+ <source>Storeman</source>
+ <comment>name for the storeman repo</comment>
+ <translation>Storeman</translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum</source>
+ <comment>name for the chum repo</comment>
+ <translation>SailfishOS:Chum</translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum Testing</source>
+ <comment>name for the chum testing repo</comment>
+ <translation>Sailfishos:Chum Test</translation>
+ </message>
+ <message>
+ <source>MLS</source>
+ <comment>name for the Nubecula Offline MLS repo</comment>
+ <translation>MLS</translation>
+ </message>
+ <message>
+ <source>OpenRepos: %1</source>
+ <comment>prefix for a openrepos repo</comment>
+ <translation>OpenRepos: %1</translation>
+ </message>
</context>
<context>
<name>StatsPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/translations/settings-install-history-en.ts
^
|
| @@ -92,6 +92,84 @@
<source>Loading…</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Hide local</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show local</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Store</source>
+ <comment>name for the jolla store repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla System</source>
+ <comment>name for the jolla jolla repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Android App Support</source>
+ <comment>name for the android support repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Applications</source>
+ <comment>name for the jolla apps repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Exchange Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>XT9 Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Feature</source>
+ <comment>name for the jolla customer repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation0 repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation1 repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Storeman</source>
+ <comment>name for the storeman repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum</source>
+ <comment>name for the chum repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum Testing</source>
+ <comment>name for the chum testing repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>MLS</source>
+ <comment>name for the Nubecula Offline MLS repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>OpenRepos: %1</source>
+ <comment>prefix for a openrepos repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StatsPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/translations/settings-install-history-ru.ts
^
|
| @@ -98,6 +98,84 @@
<source>Loading…</source>
<translation type="unfinished">загрузка данных</translation>
</message>
+ <message>
+ <source>Hide local</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show local</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Store</source>
+ <comment>name for the jolla store repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla System</source>
+ <comment>name for the jolla jolla repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Android App Support</source>
+ <comment>name for the android support repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Applications</source>
+ <comment>name for the jolla apps repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Exchange Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>XT9 Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Feature</source>
+ <comment>name for the jolla customer repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation0 repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation1 repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Storeman</source>
+ <comment>name for the storeman repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum</source>
+ <comment>name for the chum repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum Testing</source>
+ <comment>name for the chum testing repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>MLS</source>
+ <comment>name for the Nubecula Offline MLS repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>OpenRepos: %1</source>
+ <comment>prefix for a openrepos repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StatsPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history-0.9.16.tar.gz/translations/settings-install-history-sv.ts
^
|
| @@ -117,6 +117,84 @@
<source>Loading…</source>
<translation type="unfinished">Läsa in</translation>
</message>
+ <message>
+ <source>Hide local</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show local</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Store</source>
+ <comment>name for the jolla store repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla System</source>
+ <comment>name for the jolla jolla repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Android App Support</source>
+ <comment>name for the android support repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Applications</source>
+ <comment>name for the jolla apps repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Exchange Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>XT9 Feature</source>
+ <comment>name for the jolla feature repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Jolla Feature</source>
+ <comment>name for the jolla customer repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation0 repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Device Adaptation</source>
+ <comment>name for the jolla adaptation1 repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Storeman</source>
+ <comment>name for the storeman repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum</source>
+ <comment>name for the chum repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>SailfishOS:Chum Testing</source>
+ <comment>name for the chum testing repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>MLS</source>
+ <comment>name for the Nubecula Offline MLS repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>OpenRepos: %1</source>
+ <comment>prefix for a openrepos repo</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>StatsPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:install-history.yaml
^
|
| @@ -1,6 +1,6 @@
Name: install-history
Summary: Shows when packages have been installed or uninstalled
-Version: 0.9.15
+Version: 0.9.16
Release: 1
Group: Applications
License: Apache 2.0
|
