[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -3,9 +3,9 @@
<param name="url">https://github.com/sailfishos-chum/bugger.git</param>
<!--
<param name="branch">logcollect</param>
- <param name="revision">0.9.9+git2</param>
- -->
<param name="revision">chum-testing</param>
+ -->
+ <param name="revision">0.9.9+git3</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/README_logcollect.md
^
|
@@ -1,53 +0,0 @@
-## Bugger! log collect plugin system
-
-Bugger! provides a systemd Target as well as a Service Template to facilitate
-"plug-in" functionality for log gathering.
-
-### Adding a script to the log collector:
-
-In order to add your script to the Bugger! log collector, do the following:
-
-1. create a POSIX shell script which outputs logging to standard output
-2. name the script `gather-logs-$YOURNAME.sh`
-3. place the script into `/usr/share/harbour-bugger/scripts` and set it executable
-4. use the systemd template service
- `harbour-bugger-gather-logs-plugin@.service` to add your script to the
- plugin service. I.e. do `systemctl --user enable
- harbour-bugger-gather-logs-plugin@$YOURNAME.service` The template adds a
- dependency on the `harbour-bugger-gather-logs.target` target, which is
- called by the app.
-
-*Notes:*
-
- - Bugger! will run the log creation, but will not add the created log files in
- the app. Users will have to select them manually.
- - The script will be run from systemd with `/bin/sh -c "scriptname"`, so make
- sure its is /bin/sh compatible!
- - log output will be written to
- `~/Documents/YYYY-MM-DD_harbour-bugger-gather-logs-plugin@$YOURNAME.log`
- - `harbour-bugger-gather-logs-plugin@.service` uses `ProtectSystem=full`, so
- don't expect any location to be writable in your script.
- - scripts are run in systemd user scope. You can't be root. If you need to be
- root, use `pkexec` to prompt users for the lock code/fingerprint.
-
-Of course, you are free to not use the Service Template and just depend on the
-Target from any custom systemd services you have written.
-
-If your log collecting script is part of a package, you can depend on
-`harbour-bugger-gather-logs` to make sure the infrastructure is installed.
-
-### Example
-
-A very basig "Hello World" example is in the `contrib` folder and part of the
-`harbour-bugger-gather-logs-contrib` package.
-
-Is places a script in `/usr/share/harbour-bugger/scripts` and can be activated by doing
-
- systemctl --user enable harbour-bugger-gather-logs-plugin@hello-world.service`
-
-### Submitting scripts
-
-If you would like to add a log collection script to the -contrib package,
-please file a Pull Request, placing the script in the `contrib` directory.
-
-
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/contrib/contrib.pri
^
|
@@ -1,4 +0,0 @@
-INSTALLS += contrib
-
-contrib.files = $$PWD/gather-logs-*.sh
-contrib.path = $$INSTALL_ROOT/usr/share/$${TARGET}/scripts
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/contrib/gather-logs-hello-world.sh
^
|
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-printf '%s sais"\n\tHello World!\n' "$0"
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/components/FileList.qml
^
|
@@ -1,38 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-import Sailfish.Silica 1.0
-
-SilicaGridView { id: root
- property bool showPlaceholder: true
- property bool filtered: false
- width: parent.width
- height: Theme.iconSizeLarge * Math.max(count, 2)
- cellWidth: parent.width/2
- cellHeight: Theme.iconSizeLarge
- delegate: LogfileDelegate { hidden: ( root.filtered && (pastedUrl.length ==0)) }
- ViewPlaceholder {
- enabled: (root.count == 0) && showPlaceholder
- text: "No files."
- hintText: "Pull down to add log files."
- }
-}
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/components/LogGatherer.qml
^
|
@@ -1,115 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-import Sailfish.Silica 1.0
-import Nemo.DBus 2.0
-
-Page {
- id: page
-
- readonly property string unitBaseName: "harbour-bugger-gather-logs"
- readonly property string svcFileName: unitBaseName + ".service"
- readonly property string tgtFileName: unitBaseName + ".target"
- readonly property string tgtBusName: svcFileName.replace(/\./g, "_2e").replace(/-/g, "_2d")
-
- property bool svcExists: false
- property bool tgtExists: false
- property bool tgtIsEnabled: false
-
- function start() { dbusTarget.startTarget() }
-
- property bool logCreated: false
-
- Component.onCompleted: {
- dbusManager.queryService()
- dbusManager.queryTarget()
- }
-
- DBusInterface {
- id: dbusManager
- service: 'org.freedesktop.systemd1'
- path: '/org/freedesktop/systemd1'
- iface: 'org.freedesktop.systemd1.Manager'
-
- // receive signals:
- signalsEnabled: true;
- Component.onCompleted: call('Subscribe')
-
- function reload() {
- call('Reload')
- }
-
- // signal handler for finished job:
- function jobRemoved(id, job, unit, result) {
- // NB: we listen for the service to be done, not the target.
- // we don't want to go into an endless loop of popups.
- if (unit == page.svcFileName) {
- if (result == "done") {
- app.popup(qsTr("Log gathering successsful!"))
- page.logCreated = true;
- } else {
- app.popup(qsTr("Log gathering failed!"))
- }
- }
- }
- function queryService() {
- typedCall('GetUnitFileState',
- { 'type': 's', 'value': svcFileName },
- function(result) {
- page.svcExists = true
- },
- function(error, message) {
- console.warn('GetUnitFileStatus failed:', error)
- console.warn('GetUnitFileStatus message:', message)
- page.svcExists = false
- })
- }
- function queryTarget() {
- typedCall('GetUnitFileState',
- { 'type': 's', 'value': tgtFileName },
- function(result) {
- page.tgtExists = true
- },
- function(error, message) {
- console.warn('GetUnitFileStatus failed:', error)
- console.warn('GetUnitFileStatus message:', message)
- page.tgtExists = false
- })
- }
- }
-
- DBusInterface { id: dbusTarget
- bus: DBus.SessionBus
- service: 'org.freedesktop.systemd1'
- iface: 'org.freedesktop.systemd1.Unit'
- path: '/org/freedesktop/systemd1/unit/' + tgtBusName
-
- function startTarget() {
- call('Restart',
- ['replace'],
- function(result) { }, //console.debug("Job:", JSON.stringify(result)); },
- function(result) { console.warn(qsTr("Start"), JSON.stringify(result)) }
- );
- }
- }
-}
-
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/components/LogLoader.qml
^
|
@@ -1,62 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-
-QtObject {
- id: page
-
- property ListModel model: ListModel{}
-
- onModelChanged: reload()
-
- function reload() {
- if (!model) return
- for (var i = 0; i < model.count; ++i) {
- getFileFrom(i, model.get(i))
- }
- }
-
- /* load files from URLs into data buffer */
- function getFileFrom(index, data) {
- //console.debug("Trying to load file contents for", JSON.stringify(data))
- var url = data.url
- var r = new XMLHttpRequest()
- r.open('GET', url);
- r.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
- //r.responseType = 'text';
- //r.responseType = 'arraybuffer'; //we need binary data
- //r.responseType = 'blob'; //we need binary data
- r.send();
-
- r.onreadystatechange = function(event) {
- if (r.readyState == XMLHttpRequest.DONE) {
- if (r.status === 200 || r.status == 0) {
- console.debug("Filedata loaded: about", r.response.split("\n").length, "lines");
- model.setProperty(index, "dataStr", r.response)
- } else {
- console.warn("Filedata load failed:", JSON.stringify(r.response));
- }
- }
- }
- }
-}
-
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/components/LogPaster.qml
^
|
@@ -1,84 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-import "../config/settings.js" as Settings
-
-Item {
- property var config: Settings.config.paste
- property string postUrl: config.scheme + "://" + config.host + config.uri
- property string uploading: ""
-
- property ListModel model: ListModel{}
- property bool done: model.count == (successCount + errorCount)
- property int successCount: 0
- property int errorCount: 0
-
- onModelChanged: {
- if (!model) return
- successCount = 0;
- errorCount = 0;
- for (var i = 0; i < model.count; ++i) {
- pasteFile(i, model.get(i))
- //delay(pasteFile(model.get(i)))
- }
- }
-
- Timer { id: delayTimer; interval: 1000 }
- function delay(callback) {
- delayTimer.triggered.connect(callback)
- delayTimer.start();
- }
-
- function pasteFile(index, data) {
- //console.debug("trying to upload:", JSON.stringify(data))
- uploading = data.fileName
- var r = new XMLHttpRequest()
- r.open('POST', postUrl);
- r.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
- r.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
- //console.debug("Sending:", payload);
- const fileContent = data["dataStr"]
- console.assert( fileContent.length>0, "Trying to upload empty log data")
-
- const payload =
- 'expiry_days=' + config.expireDays
- + '&title=' + data.fileName
- + '&content=' + encodeURIComponent(fileContent)
- r.send(payload);
-
- r.onreadystatechange = function(event) {
- if (r.readyState == XMLHttpRequest.DONE) {
- if (r.status === 200 || r.status == 0) {
- console.info("upload sucessful:", data["fileName"], r.response);
- model.setProperty(index, "pastedUrl", r.response.replace(/"/g, ""))
- successCount++;
- } else {
- console.warn("error in processing request.", r.status, r.statusText);
- app.popup(qsTr("Error uploading: %1 - %2", "%1: error code, %2: error message").arg(r.status).arg(r.statusText));
- errorCount++;
- }
- }
- }
- uploading = ""
- }
-}
-
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/components/LogfileDelegate.qml
^
|
@@ -1,75 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-import Sailfish.Silica 1.0
-
-GridItem { id: root
- property string displayName
-
- anchors.margins: Theme.paddingSmall
- width: GridView.view.cellWidth
- contentHeight: Math.max(GridView.view.cellHeight, Theme.iconSizeLarge, content.height)
-
- // replicate the 'hidden' property from Sailfish.Silica.ListItem
- property bool hidden
- Item {
- states: State {
- when: root.hidden
- name: "hidden"
- PropertyChanges {
- target: root
- contentHeight: 0
- enabled: false
- opacity: 0.0
- }
- }
- }
- Row { id: content
- height: icon.height
- width: parent.width
- Icon { id: icon
- source: Theme.iconForMimeType(mimeType) //+ '?' + ( (dataStr) ? "green" : Theme.primaryColor )
- height: Theme.iconSizeLarge
- width: height
- sourceSize.width: height
- sourceSize.height: height
- }
- Column {
- width: parent.width - icon.width
- anchors.verticalCenter: icon.verticalCenter
- Label { text: fileName; width: parent.width; truncationMode: TruncationMode.Fade; font.pixelSize: Theme.fontSizeSmall; color: Theme.highlightColor }
- Label { text: mimeType; width: parent.width; truncationMode: TruncationMode.Fade; font.pixelSize: Theme.fontSizeTiny; color: Theme.secondaryColor }
- Row { width: parent.width; spacing: Theme.paddingSmall
- Label { text: (model.fileSize > 0) ? Format.formatFileSize(model.fileSize) : "?"; truncationMode: TruncationMode.Fade; font.pixelSize: Theme.fontSizeTiny; color: Theme.secondaryColor }
- Label { text: (model.pastedUrl) ? qsTr("uploaded"): qsTr("not uploaded"); truncationMode: TruncationMode.Fade; font.pixelSize: Theme.fontSizeTiny; color: Theme.secondaryColor }
- }
- //Label { text: filePath; width: parent.width; truncationMode: TruncationMode.Fade; font.pixelSize: Theme.fontSizeTiny; color: Theme.secondaryColor }
- //Label { text: fileNameOrig ? fileNameOrig : ""; width: parent.width; truncationMode: TruncationMode.Fade; font.pixelSize: Theme.fontSizeTiny; color: Theme.secondaryColor }
- }
- }
- menu: ContextMenu {
- width: (parent) ? parent.width : 0 // gives a log warning but works ;)
- MenuItem { text: qsTr("View"); onClicked: { pageStack.push("../pages/LogViewPage.qml", { "fileData": model.dataStr, "fileName": model.fileName }) } }
- MenuItem { text: qsTr("Remove"); onClicked: remorseDelete(function(){ filesModel.remove(index) }) }
- }
-}
-
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/pages/FilePage.qml
^
|
@@ -1,194 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-import Sailfish.Silica 1.0
-import Sailfish.Pickers 1.0
-import "../components"
-import "../config/settings.js" as Settings
-
-Dialog { id: page
-
- canAccept: false
- property var config: Settings.config
-
- onRejected: filesModel.clear()
-
- /*
- states: [
- State { name: "populated"; when: filesModel.count > 0
- },
- State { name: "prepared";
- },
- State { name: "uploading"; when: (loadedFiles.count > 0) && (!paster.done)
- PropertyChanges { target: busy; running: true }
- },
- State { name: "uploaded"; when: paster.done
- PropertyChanges { target: busy; running: false }
- }
- ]
- onStateChanged: console.debug("New state:", state)
- */
-
- Component { id: picker
- MultiFilePickerDialog {
- title: qsTr("Select log files to add")
- nameFilters: [ '*.log', '*.txt', '*.json' ]
- // signal is received twice
- property bool acceptedHandled: false
- onAccepted: {
- if (acceptedHandled) return
- for (var i = 0; i < selectedContent.count; ++i) {
- var o = selectedContent.get(i)
- o["dataStr"] = ""; // prepare property so we don't need dynamicRoles
- o["pastedUrl"] = ""; // prepare property so we don't need dynamicRoles
- filesModel.append(o)
- console.debug("added", i+1, "of" , selectedContent.count, "files:")
- console.debug(JSON.stringify(o, null, 2))
- }
- acceptedHandled=true
- }
- }
- }
-
- function loadFiles() {
- loader.model = filesModel
- loader.reload()
- }
- function upload() {
- paster.model = filesModel
- }
- function startGatherer() { gather.start() }
- LogGatherer { id: gather } // executes systemd things
- LogLoader { id: loader } // gets file contents
- LogPaster { id: paster } // uploads files to "pastebin"
- Connections {
- target: gather
- /*
- * mimic the selectedContentProperties schema from FilePicker and add to the model
- *
- * {
- "contentType": 6,
- "fileName": "2022-12-01_harbour-bugger-gather-hybris-logs.log",
- "filePath": "/home/nemo/Documents/2022-12-01_harbour-bugger-gather-hybris-logs.log",
- "fileSize": 439122,
- "mimeType": "text/x-log",
- "title": "2022-12-01_harbour-bugger-gather-hybris-logs.log",
- "url": "file:///home/nemo/Documents/2022-12-01_harbour-bugger-gather-hybris-logs.log",
- "url": "file:///home/nemo/Documents/2022-12-01_harbour-bugger-gather-hybris-logs.log"
- }
- */
- onLogCreatedChanged: {
- //const logBaseName = new Date().toISOString().substring(0,10) + "_" + "harbour-bugger-gather-logs"
- const logBaseName = new Date().toISOString().substring(0,10) + "_" + config.gather.basename
- const elements = []
- const o = {}
- //const postfixes = [ ".log", "_kernel.log" ];
- const postfixes = config.gather.postfixes
- const pretty = config.gather.prettynames
- postfixes.forEach(function(postfix) {
- o = {};
- o["title"] = "";
- const fn = logBaseName + postfix;
- for ( var i = 0; i < pretty.length; ++i) {
- const re = new RegExp(pretty[i].pattern);
- if (re.test(postfix)) {
- console.debug("found pretty name", pretty[i].name, "from pattern", pretty[i].pattern, "for filename", fn)
- o["title"] = pretty[i].name;
- break;
- }
- };
- o["mimeType"] = (/json$/.test(postfix)) ? "application/json" : "text/plain";
- o["fileName"] = logBaseName + postfix;
- o["filePath"] = StandardPaths.documents + "/" + o["fileName"];
- o["url"] = Qt.resolvedUrl(o["filePath"]);
- o["fileSize"] = -1; // prepare property so we don't need dynamicRoles
- o["dataStr"] = ""; // prepare property so we don't need dynamicRoles
- o["pastedUrl"] = ""; // prepare property so we don't need dynamicRoles
- console.debug("Adding:", JSON.stringify(o,null,2))
- elements.push(o)
- })
- // add the generated information to the model
- elements.forEach(function(element) { filesModel.append(element)})
- loadFiles()
- }
- }
- Connections {
- target: paster
- onDoneChanged: {
- if (!paster.done) return
- canAccept = true
- progress.visible = false
- app.popup(qsTr("Uploading finished: %1 successful, %2 error.").arg(paster.successCount).arg(paster.errorCount))
- }
- onUploadingChanged: {
- if (paster.uploading !== "") {
- console.debug("uploading", paster.uploading)
- progress.visible = true
- //progress.label = qsTr("uploading %1/%2").arg(paster.successCount + 1).arg(filesModel.count)
- progress.label = qsTr("uploading %1 files, %2 done").arg(filesModel.count).arg(paster.successCount)
- }
- }
- }
-
- SilicaFlickable { id: flick
- anchors.fill: parent
- contentHeight: col.height
- DialogHeader { id: header ; width: parent.width ; title: qsTr("Gather Files") }
- Column { id: col
- width: parent.width - Theme.horizontalPageMargin
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: header.bottom
- Label {
- width: parent.width
- font.pixelSize: Theme.fontSizeSmall
- color: Theme.secondaryHighlightColor
- wrapMode: Text.Wrap
- horizontalAlignment: Text.AlignJustify
- text: qsTr("Here you can gather and add log files, which will be uploaded to a 'Pastebin' type of service, and added as links to your Bug Report.") + " "
- + "\n\n"
- + qsTr("Use the Pulley Menu to populate the file list.") + " "
- + qsTr("Long press on a file in the list to remove.") + " "
- + qsTr("Finally, use the Pulley Menu to upload the data and add the links.")
- + "\n\n"
- + qsTr("The data will be uploaded to %1, and be publicly available. Be sure you don't add private or confidential information.").arg(config.paste.host)
- }
- ProgressBar { id: progress
- indeterminate: true
- visible: false
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width
- }
- SectionHeader { text: qsTr("List of files to upload") }
- FileList { id: fileList; model: filesModel
- cellWidth: page.isLandscape ? parent.width/2 : parent.width
- }
- }
- VerticalScrollDecorator {}
- PullDownMenu { id: pdm
- flickable: flick
- MenuItem { text: qsTr("Upload Contents"); onClicked: { upload() } }
- MenuItem { text: qsTr("Add Files"); onClicked: pageStack.push(picker) }
- MenuItem { text: qsTr("Collect Logs"); onClicked: { startGatherer() } }
- }
- }
-}
-
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/qml/pages/LogViewPage.qml
^
|
@@ -1,66 +0,0 @@
-/*
-
-Apache License 2.0
-
-Copyright (c) 2022 Peter G. (nephros)
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-import QtQuick 2.6
-import Sailfish.Silica 1.0
-
-Page {
- id: page
-
- property string fileName: ""
- property string fileData: ""
-
- SilicaListView {
- id: view
- header: PageHeader { title: qsTr("Log File"); description: fileName; width: view.width
- Separator { anchors.verticalCenter: parent.bottom; width: parent.width; color: Theme.primaryColor }
- }
- anchors.fill: parent
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width - Theme.horizontalPageMargin
- topMargin: Theme.paddingLarge
- bottomMargin: Theme.paddingLarge
- model: 1
- delegate: SilicaFlickable {
- width: ListView.view.width
- height: ListView.view.height
- contentHeight: content.height
- contentWidth: content.width
- ScrollDecorator{}
- Label { id: content
- //x: Theme.horizontalPageMargin
- anchors.topMargin: Theme.paddingLarge
- anchors.bottomMargin: Theme.paddingLarge
- anchors.leftMargin: Theme.paddingMedium
- anchors.rightMargin: Theme.paddingMedium
-
- text: page.fileData.length > 0 ? page.fileData : ""
-
- color: Theme.secondaryColor
- font.pixelSize: Theme.fontSizeExtraSmall
- font.family: "monospace"
- wrapMode: Text.NoWrap
- verticalAlignment: Text.AlignVCenter
- }
- }
- }
-}
-
-// vim: expandtab ts=4 st=4 sw=4 filetype=javascript
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/systemd/harbour-bugger-gather-logs-plugin@.service
^
|
@@ -1,24 +0,0 @@
-[Unit]
-Description=Collect Logfiles Bugger! Plugin: %i
-Documentation=https://github.com/sailfishos-chum/bugger/blob/master/README_logcollect.md
-Documentation=file:///usr/share/harbour-bugger/scripts/README_logcollect.md
-Before=harbour-bugger-gather-logs.target
-
-ConditionFileIsExecutable=/usr/share/harbour-bugger/scripts/gather-logs-%i.sh
-
-[Service]
-Type=oneshot
-ProtectSystem=strict
-ProtectHome=read-only
-#PrivateNetwork=true
-ProtectKernelTunables=true
-
-ReadWritePaths=%h/Documents
-ExecStart=/bin/sh -c "\
- /usr/share/harbour-bugger/scripts/gather-logs-%i.sh > %h/Documents/$(date -I)_%N.log; \
- /usr/bin/chmod 0600 %h/Documents/$(date -I)_%N.log; \
- /usr/bin/chown %u %h/Documents/$(date -I)_%N.log; \
-"
-
-[Install]
-WantedBy=harbour-bugger-gather-logs.target
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/systemd/harbour-bugger-gather-logs.service
^
|
@@ -1,19 +0,0 @@
-[Unit]
-Description=Collect Journal file for Bugger!
-Before=harbour-bugger-gather-logs.target
-After=lipstick-security-ui.service
-Requires=lipstick-security-ui.service
-
-[Service]
-Type=oneshot
-ProtectSystem=full
-ReadWritePaths=%h/Documents
-ExecStart=/usr/bin/pkexec /bin/sh -c "\
- /usr/bin/journalctl --no-hostname --all --quiet --utc --priority=emerg..debug -o short-precise _TRANSPORT=journal | grep -v selinux > %h/Documents/$(date -I)_%N.log; \
- /usr/bin/journalctl --no-hostname --all --quiet --utc --priority=emerg..debug -o short-precise -k > %h/Documents/$(date -I)_%N_kernel.log; \
- /usr/bin/chmod 0600 %h/Documents/$(date -I)_%N*log; \
- /usr/bin/chown %u %h/Documents/$(date -I)_%N*log; \
-"
-
-[Install]
-WantedBy=harbour-bugger-gather-logs.target
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/systemd/harbour-bugger-gather-logs.target
^
|
@@ -1,7 +0,0 @@
-[Unit]
-Description=Collect Log files for Bugger!
-Documentation=https://github.com/sailfishos-chum/bugger/blob/master/README_logcollect.md
-Documentation=file:///usr/share/harbour-bugger/scripts/README_logcollect.md
-DefaultDependencies=no
-StopWhenUnneeded=true
-After=user-session.target
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/systemd/harbour-bugger-gather-logs_android.service
^
|
@@ -1,38 +0,0 @@
-[Unit]
-Description=Collect Android Support logcat file for Bugger!
-Documentation=https://docs.sailfishos.org/Support/Help_Articles/Collecting_Logs/Collect_Logs_with_Logcat
-
-After=lipstick-security-ui.service
-Requires=lipstick-security-ui.service
-
-# would be nice, but user service can't depend on system service:
-# therefore, we use ExecStartPre below instead
-# After=aliendalvik.service
-# Requisite=aliendalvik.service
-# BindsTo=aliendalvik.service
-
-PartOf=harbour-bugger-gather-logs.target
-
-ConditionPathExists=/system/bin/logcat
-
-[Service]
-Type=oneshot
-ProtectSystem=full
-ReadWritePaths=%h/Documents
-ExecStartPre=/bin/sh -c '/usr/bin/systemctl is-active --quiet aliendalvik.service'
-ExecStart=/usr/bin/pkexec /bin/sh -c "\
- if [ $(awk -F= '/^VERSION_ID/ {print $2}' /etc/os-release | awk -F. '{print $1 $2 $3}') -ge 450 ]; \
- then; \
- /usr/bin/appsupport-attach /system/bin/logcat -d > %h/Documents/$(date -I)_%N.log; \
- elif [ $(awk -F= '/^VERSION_ID/ {print $2}' /etc/os-release | awk -F. '{print $1 $2 $3}') -ge 440 ]; \
- then; \
- /usr/bin/lxc-attach -n aliendalvik --lxcpath=/tmp/aliendalvik -- /system/bin/logcat -d > %h/Documents/$(date -I)_%N.log; \
- else; \
- /usr/bin/lxc-attach -n aliendalvik -- /system/bin/logcat -d > %h/Documents/$(date -I)_%N.log; \
- fi; \
- /usr/bin/chmod 0600 %h/Documents/$(date -I)_%N.log; \
- /usr/bin/chown %u %h/Documents/$(date -I)_%N.log; \
-"
-
-[Install]
-WantedBy=harbour-bugger-gather-logs.target
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/systemd/harbour-bugger-gather-logs_hybris.service
^
|
@@ -1,29 +0,0 @@
-[Unit]
-Description=Collect hybris logcat file for Bugger!
-
-After=lipstick-security-ui.service
-Requires=lipstick-security-ui.service
-
-# would be nice, but user service can't depend on system service:
-# therefore, we use ExecStartPre below instead
-# After=aliendalvik.service
-# Requisite=aliendalvik.service
-# BindsTo=aliendalvik.service
-
-PartOf=harbour-bugger-gather-logs.target
-
-ConditionPathExists=/usr/libexec/droid-hybris/system/bin/logcat
-
-[Service]
-Type=oneshot
-ProtectSystem=full
-ReadWritePaths=%h/Documents
-ExecStartPre=/bin/sh -c '/usr/bin/systemctl is-active --quiet droid-hal-init.service'
-ExecStart=/bin/sh -c "\
- /usr/libexec/droid-hybris/system/bin/logcat -d > %h/Documents/$(date -I)_%N.log; \
- /usr/bin/chmod 0600 %h/Documents/$(date -I)_%N.log; \
- /usr/bin/chown %u %h/Documents/$(date -I)_%N.log; \
-"
-
-[Install]
-WantedBy=harbour-bugger-gather-logs.target
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-bugger-0.10.3+git1+master.20230213173337.83df2b1.tar.gz/systemd/systemd.pri
^
|
@@ -1,16 +0,0 @@
-OTHER_FILES += $${TARGET}-gather-logs.target\
- $${TARGET}-gather-logs.service\
- $${TARGET}-gather-logs_hybris.service \
- $${TARGET}-gather-logs_android.service \
- $${TARGET}-gather-logs-plugin@.service
-
-INSTALLS += sdservice
-
-sdservice.files = $$PWD/$${TARGET}-gather-logs.target \
- $$PWD/$${TARGET}-gather-logs.service \
- $$PWD/$${TARGET}-gather-logs_android.service \
- $$PWD/$${TARGET}-gather-logs_hybris.service \
- $$PWD/$${TARGET}-gather-logs-plugin@.service
-
-sdservice.path = $$INSTALL_ROOT/usr/lib/systemd/user
-
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/harbour-bugger.desktop
^
|
@@ -2,7 +2,7 @@
Type=Application
Icon=harbour-bugger
X-Nemo-Application-Type=silica-qt5
-Exec=invoker --type=silica-qt5 sailfish-qml harbour-bugger
+Exec=sailfish-qml harbour-bugger
Name=Bugger!
Name[en]=Bugger!
Name[de]=Bugger!
@@ -12,4 +12,4 @@
[X-Sailjail]
ApplicationName=Bugger
OrganizationName=sailfishos-chum
-Permissions=Documents
+#Permissions=Base
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/harbour-bugger.pro
^
|
@@ -32,15 +32,8 @@
INSTALLS += qml
-readme.files = README_logcollect.md
-readme.path = /usr/share/$${TARGET}/scripts
-
-INSTALLS += readme
-
OTHER_FILES += $$files(rpm/*)
include(translations/translations.pri)
-include(systemd/systemd.pri)
-include(contrib/contrib.pri)
include(icons/icons.pri)
include(sailjail/sailjail.pri)
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/qml/components/GuideLabel.qml
^
|
@@ -40,12 +40,6 @@
Information about debugging and collecting logs can be found here:
-Jolla Log Collecting script: https://jolla.zendesk.com/hc/en-us/articles/360013910599
-
-Jolla article about logs for some special use cases: https://jolla.zendesk.com/hc/en-us/articles/4405752484242
-
-Other articles on log colection: https://jolla.zendesk.com/hc/en-us/search?utf8=✓&query=Logs
-
Testing: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
Wiki: https://forum.sailfishos.org/t/12751/3
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/qml/config/settings.js
^
|
@@ -4,37 +4,15 @@
"os": 'file:///etc/sailfish-release',
"hw": 'file:///etc/hw-release',
"ssu": 'file:///etc/ssu/ssu.ini',
- "pm": 'file:///etc/patchmanager2.conf',
- "useruid": 100000
+ "pm": 'file:///etc/patchmanager2.conf'
},
"submit": {
"scheme": 'https',
"host": 'forum.sailfishos.org',
"uri": '/new-topic?category_id=',
"category_bugs": '13',
- "category_features": '23',
"category_cbeta": '21',
},
- "upload": {
- "scheme": 'https',
- "host": 'forum.sailfishos.org',
- "uri": '/uploads.json'
- },
- "gather": {
- "basename": "harbour-bugger-gather-logs",
- "postfixes": [ ".log", "_kernel.log" ],
- "prettynames": [
- { "pattern": "/_kernel/", "name": "Kernel" },
- { "pattern": "/_android/", "name": "Android" },
- { "pattern": "/_hybris/", "name": "Hybris" },
- ]
- },
- "paste": {
- "scheme": 'https',
- "host": 'paste.mozilla.org',
- "uri": '/api/',
- "expireDays": 182
- },
"validation": {
"minTitle": 20,
"minDesc": 30,
@@ -42,7 +20,7 @@
"good": 150
},
"persistence": {
- "fieldKeys": 15,
+ "fieldKeys": 14,
"saveInterval": 7000
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/qml/config/sfos_versions.js
^
|
@@ -7,6 +7,7 @@
.pragma library
var data = {
"version": [
+ "4.5.0.16",
"4.4.0.72",
"4.4.0.68",
"4.4.0.64",
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/qml/harbour-bugger.qml
^
|
@@ -54,8 +54,6 @@
BugInfo { id: bugInfo }
- ListModel { id: filesModel } // for attachments
-
/* read fileUrl from filesystem, assign to bugInfo according to what */
function getInfo(fileUrl, what) {
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/qml/pages/MainPage.qml
^
|
@@ -68,12 +68,10 @@
/* just to add something of ours to the report */
readonly property string infoFooter: 'the initial version of this bug report was created using '
- + '<a href="' + 'https://github.com/sailfishos-chum/bugger/releases/">'
+ + '<a href="' + 'https://github.com/sailfishos-chum/bugger/releases/' + Qt.application.version + '">'
+ Qt.application.name + ' ' + Qt.application.version
+ '</a>'
- property var links: []
-
// used to clear this form, and the persistent storage
property var defaultFieldContents: {
"text_title": "",
@@ -89,8 +87,7 @@
"regver": -1,
"regarch": -1,
"othersw": false,
- "repro": -1,
- "links": []
+ "repro": -1
}
// Pavlov!! :)
@@ -115,7 +112,7 @@
}
// from org.nemomobile.systemsettings to determine Device Owner
- UserInfo{id: userInfo; uid: config.sources.useruid }
+ UserInfo{id: userInfo; uid: 100000}
// from org.nemomobile.systemsettings to determine OS language
LanguageModel{id: languageModel}
property string oslanguage: languageModel.languageName(languageModel.currentIndex)
@@ -391,16 +388,6 @@
label: qsTr("custom changes, installed packages etc.")
}
}
- Column {
- visible: fileList.count > 0
- width: parent.width
- SectionHeader { text: qsTr("Links/Attachments (%1)").arg(fileList.count) }
- FileList{ id: fileList
- model: filesModel
- showPlaceholder: false
- filtered: true
- }
- }
}
VerticalScrollDecorator {}
}
@@ -408,23 +395,6 @@
flickable: flick
MenuItem { text: qsTr("About"); onClicked: { pageStack.push(Qt.resolvedUrl("AboutPage.qml")) } }
MenuItem { text: qsTr("Help"); onClicked: { pageStack.push(Qt.resolvedUrl("../components/WelcomeDialog.qml")) } }
- MenuItem { text: qsTr("Add Logfiles")
- onClicked: {
- var dialog = pageStack.push(Qt.resolvedUrl("FilePage.qml"))
- dialog.accepted.connect(function() {
- console.debug("dialog done.")
- for (var i = 0; i < filesModel.count; ++i) {
- var d = filesModel.get(i)
- //links.push('<a href="' + d.pastedUrl + '">' + d.fileName + '</a>')
- if (d.title && d.pastedUrl) {
- links.push(' - [' + d.title + '](' + d.pastedUrl + ') ')
- } else if (d.fileName && d.pastedUrl) {
- links.push(' - [' + d.fileName + '](' + d.pastedUrl + ') ')
- }
- }
- })
- }
- }
MenuItem { text: qsTr("Reset all to default"); onDelayedClick: { Remorse.popupAction(page, qsTr("Cleared."), function() { resetFields() }) } }
//MenuItem { text: qsTr("Settings"); onClicked: { pageStack.push(Qt.resolvedUrl("SettingsPage.qml")) } }
}
@@ -499,10 +469,6 @@
+ "\n"
+ "Device Owner User: " + userInfo.username + " \n"
+ "Home Encryption: " + encStr + " \n"
- + "\n\n"
- + "LOG FILE LINKS:\n"
- + "=================\n\n"
- + links.join('\n')
+ "\n\n\n\n"
// add footer:
+ "---- \n"
@@ -600,8 +566,7 @@
"regver": regver.currentIndex,
"regarch": regarch.currentIndex,
"othersw": othersw.checked,
- "repro": repro.sliderValue,
- "links": links
+ "repro": repro.sliderValue
};
Util.store(post);
}
@@ -655,7 +620,6 @@
regarch.currentIndex = data.regarch;
othersw.checked = data.othersw;
repro.value = data.repro;
- links = data.links;
} finally {
preventSave = false;
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/sailjail/harbour-bugger.profile
^
|
@@ -41,10 +41,3 @@
# patchmanager detection parses this for enabled patches
private-etc patchmanager2.conf
-# BEG systemd manager and related
-dbus-user.talk org.freedesktop.systemd1
-dbus-user.call org.freedesktop.systemd1=org.freedesktop.systemd1@/*
-dbus-user.talk *=org.freedesktop.systemd1
-dbus-user.call *=org.freedesktop.systemd1.Manager@/*
-dbus-user.call *=org.freedesktop.systemd1.Unit@/*
-# END systemd manager and related
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/translations/harbour-bugger-de.ts
^
|
@@ -87,86 +87,6 @@
</message>
</context>
<context>
- <name>FilePage</name>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="52"/>
- <source>Select log files to add</source>
- <translation>Wähle Logdateien</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="139"/>
- <source>Uploading finished: %1 successful, %2 error.</source>
- <translation>Raufladen beendet: %1 erfolgreich, %2 mit Fehlern.</translation>
- </message>
- <message>
- <source>uploading %1/%2</source>
- <translation type="vanished">Lade %1/%2 hinauf</translation>
- </message>
- <message>
- <source>Back</source>
- <translation type="vanished">Zurück</translation>
- </message>
- <message>
- <source>Apply</source>
- <translation type="vanished">OK</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="146"/>
- <source>uploading %1 files, %2 done</source>
- <translation>hochladen: %1 Datei(en), %2 fertig</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="154"/>
- <source>Gather Files</source>
- <translation>Daten sammeln</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="165"/>
- <source>Here you can gather and add log files, which will be uploaded to a 'Pastebin' type of service, and added as links to your Bug Report.</source>
- <translation>Hier kannst du Dateien hinzufügen, die auf ein 'Pastebin'-Service hinaufgeladen werden, und als Verknüpfungen dem Bugreport hinzugefügt werden.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="167"/>
- <source>Use the Pulley Menu to populate the file list.</source>
- <translation>Verwende das Zieh-Menü, um die Liste der Dateien zu befüllen.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="168"/>
- <source>Long press on a file in the list to remove.</source>
- <translation>Zum Entfernen, halte das Element in der Liste gedrückt.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="169"/>
- <source>Finally, use the Pulley Menu to upload the data and add the links.</source>
- <translation>Zum Schluss verwende das Ziehmenü, um die Daten hinzufzuladen und die Verknüpfungen zu erstellen.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="171"/>
- <source>The data will be uploaded to %1, and be publicly available. Be sure you don't add private or confidential information.</source>
- <translation>Die Daten werden auf %1 hinaufgeladen und dind dann öffentlich zugänglich. Stelle sicher, daß keine privaten oder geheimen Daten dort landen.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="179"/>
- <source>List of files to upload</source>
- <translation>Liste der Dateien</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="187"/>
- <source>Upload Contents</source>
- <translation>Inhalte hinaufladen</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="188"/>
- <source>Add Files</source>
- <translation>Dateien hinzufügen</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="189"/>
- <source>Collect Logs</source>
- <translation>Logdateien sammeln</translation>
- </message>
-</context>
-<context>
<name>GuideLabel</name>
<message>
<source>
@@ -205,17 +125,25 @@
Information about debugging and collecting logs can be found here:
-Jolla Log Collecting script: https://jolla.zendesk.com/hc/en-us/articles/360013910599
+Testing: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
-Jolla article about logs for some special use cases: https://jolla.zendesk.com/hc/en-us/articles/4405752484242
+Wiki: https://forum.sailfishos.org/t/12751/3
+</source>
+ <translation>
+Bitte stelle sicher, dass du die Richtlinien zum erstellen von Bug Reports kennst und verwende die Vorlage.
-Other articles on log colection: https://jolla.zendesk.com/hc/en-us/search?utf8=✓&query=Logs
+Richtlinien: https://forum.sailfishos.org/t/22
-Testing: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
+Wenn du dir unsicher beim ausfüllen bist, stelle deine Fragen im Forum in der Kategorie 'General'.
+
+General: https://forum.sailfishos.org/c/15
+
+Informationen zum Debuggen und Erstellen von Logdateien findest du hier:
+
+Testen: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
Wiki: https://forum.sailfishos.org/t/12751/3
-</source>
- <translation type="unfinished"></translation>
+ </translation>
</message>
</context>
<context>
@@ -227,67 +155,9 @@
</message>
</context>
<context>
- <name>LogGatherer</name>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="66"/>
- <source>Log gathering successsful!</source>
- <translation>Das Zusammensammeln war erfolgreich!</translation>
- </message>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="69"/>
- <source>Log gathering failed!</source>
- <translation>Das Zusammensammeln ist fehlgeschlagen!</translation>
- </message>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="109"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
-</context>
-<context>
- <name>LogPaster</name>
- <message>
- <location filename="../qml/components/LogPaster.qml" line="75"/>
- <source>Error uploading: %1 - %2</source>
- <comment>%1: error code, %2: error message</comment>
- <translation>Fehler beim hinaufladen: %1 - %2</translation>
- </message>
-</context>
-<context>
- <name>LogViewPage</name>
- <message>
- <location filename="../qml/pages/LogViewPage.qml" line="32"/>
- <source>Log File</source>
- <translation>Logdatei</translation>
- </message>
-</context>
-<context>
- <name>LogfileDelegate</name>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="62"/>
- <source>uploaded</source>
- <translation>hinaufgeladen</translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="62"/>
- <source>not uploaded</source>
- <translation>nicht hinaufgeladen</translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="70"/>
- <source>View</source>
- <translation>Ansehen</translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="71"/>
- <source>Remove</source>
- <translation>Entfernen</translation>
- </message>
-</context>
-<context>
<name>MainPage</name>
<message>
- <location filename="../qml/pages/MainPage.qml" line="222"/>
+ <location filename="../qml/pages/MainPage.qml" line="219"/>
<source>Bug Info (%1)</source>
<translation>Bugreport (%1)</translation>
</message>
@@ -300,76 +170,76 @@
<translation type="vanished">unvollständig</translation>
</message>
<message>
- <location filename="../qml/pages/MainPage.qml" line="170"/>
- <location filename="../qml/pages/MainPage.qml" line="176"/>
- <location filename="../qml/pages/MainPage.qml" line="182"/>
+ <location filename="../qml/pages/MainPage.qml" line="167"/>
+ <location filename="../qml/pages/MainPage.qml" line="173"/>
+ <location filename="../qml/pages/MainPage.qml" line="179"/>
<source>Ready for posting</source>
<translation>Bereit zum Abschicken</translation>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/translations/harbour-bugger-en.ts
^
|
@@ -86,74 +86,6 @@
</message>
</context>
<context>
- <name>FilePage</name>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="52"/>
- <source>Select log files to add</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="139"/>
- <source>Uploading finished: %1 successful, %2 error.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="146"/>
- <source>uploading %1 files, %2 done</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="154"/>
- <source>Gather Files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="165"/>
- <source>Here you can gather and add log files, which will be uploaded to a 'Pastebin' type of service, and added as links to your Bug Report.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="167"/>
- <source>Use the Pulley Menu to populate the file list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="168"/>
- <source>Long press on a file in the list to remove.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="169"/>
- <source>Finally, use the Pulley Menu to upload the data and add the links.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="171"/>
- <source>The data will be uploaded to %1, and be publicly available. Be sure you don't add private or confidential information.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="179"/>
- <source>List of files to upload</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="187"/>
- <source>Upload Contents</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="188"/>
- <source>Add Files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="189"/>
- <source>Collect Logs</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>GuideLabel</name>
<message>
<location filename="../qml/components/GuideLabel.qml" line="32"/>
@@ -168,12 +100,6 @@
Information about debugging and collecting logs can be found here:
-Jolla Log Collecting script: https://jolla.zendesk.com/hc/en-us/articles/360013910599
-
-Jolla article about logs for some special use cases: https://jolla.zendesk.com/hc/en-us/articles/4405752484242
-
-Other articles on log colection: https://jolla.zendesk.com/hc/en-us/search?utf8=✓&query=Logs
-
Testing: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
Wiki: https://forum.sailfishos.org/t/12751/3
@@ -190,368 +116,300 @@
</message>
</context>
<context>
- <name>LogGatherer</name>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="66"/>
- <source>Log gathering successsful!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="69"/>
- <source>Log gathering failed!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="109"/>
- <source>Start</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>LogPaster</name>
- <message>
- <location filename="../qml/components/LogPaster.qml" line="75"/>
- <source>Error uploading: %1 - %2</source>
- <comment>%1: error code, %2: error message</comment>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>LogViewPage</name>
- <message>
- <location filename="../qml/pages/LogViewPage.qml" line="32"/>
- <source>Log File</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>LogfileDelegate</name>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="62"/>
- <source>uploaded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="62"/>
- <source>not uploaded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="70"/>
- <source>View</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="71"/>
- <source>Remove</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>MainPage</name>
<message>
- <location filename="../qml/pages/MainPage.qml" line="222"/>
+ <location filename="../qml/pages/MainPage.qml" line="219"/>
<source>Bug Info (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/MainPage.qml" line="148"/>
- <location filename="../qml/pages/MainPage.qml" line="154"/>
- <location filename="../qml/pages/MainPage.qml" line="160"/>
- <location filename="../qml/pages/MainPage.qml" line="166"/>
+ <location filename="../qml/pages/MainPage.qml" line="145"/>
+ <location filename="../qml/pages/MainPage.qml" line="151"/>
+ <location filename="../qml/pages/MainPage.qml" line="157"/>
+ <location filename="../qml/pages/MainPage.qml" line="163"/>
<source>incomplete</source>
<comment>State of completeness of a bug report</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/MainPage.qml" line="152"/>
- <location filename="../qml/pages/MainPage.qml" line="158"/>
- <location filename="../qml/pages/MainPage.qml" line="164"/>
+ <location filename="../qml/pages/MainPage.qml" line="149"/>
+ <location filename="../qml/pages/MainPage.qml" line="155"/>
+ <location filename="../qml/pages/MainPage.qml" line="161"/>
<source>%1 field is too short</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/MainPage.qml" line="152"/>
- <location filename="../qml/pages/MainPage.qml" line="264"/>
- <location filename="../qml/pages/MainPage.qml" line="436"/>
+ <location filename="../qml/pages/MainPage.qml" line="149"/>
+ <location filename="../qml/pages/MainPage.qml" line="261"/>
+ <location filename="../qml/pages/MainPage.qml" line="406"/>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/MainPage.qml" line="158"/>
- <location filename="../qml/pages/MainPage.qml" line="275"/>
- <location filename="../qml/pages/MainPage.qml" line="437"/>
+ <location filename="../qml/pages/MainPage.qml" line="155"/>
+ <location filename="../qml/pages/MainPage.qml" line="272"/>
+ <location filename="../qml/pages/MainPage.qml" line="407"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger-0.9.9+git3.tar.gz/translations/harbour-bugger-sv.ts
^
|
@@ -87,86 +87,6 @@
</message>
</context>
<context>
- <name>FilePage</name>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="52"/>
- <source>Select log files to add</source>
- <translation>Välj loggfiler att lägga till</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="139"/>
- <source>Uploading finished: %1 successful, %2 error.</source>
- <translation>Uppladdning slutförd: %1 felfritt, %2 fel.</translation>
- </message>
- <message>
- <source>uploading %1/%2</source>
- <translation type="vanished">laddar upp %1/%2</translation>
- </message>
- <message>
- <source>Back</source>
- <translation type="vanished">Tillbaka</translation>
- </message>
- <message>
- <source>Apply</source>
- <translation type="vanished">Tillämpa</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="146"/>
- <source>uploading %1 files, %2 done</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="154"/>
- <source>Gather Files</source>
- <translation>Samla filer</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="165"/>
- <source>Here you can gather and add log files, which will be uploaded to a 'Pastebin' type of service, and added as links to your Bug Report.</source>
- <translation>Här kan du samla in och lägga till loggfiler, som laddas upp till en "Pastebin-tjänst" och läggs till som länkar i din felrapport.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="167"/>
- <source>Use the Pulley Menu to populate the file list.</source>
- <translation>Använd dragmenyn för att fylla fillistan.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="168"/>
- <source>Long press on a file in the list to remove.</source>
- <translation>Långtryck på en fil i listan, för att ta bort.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="169"/>
- <source>Finally, use the Pulley Menu to upload the data and add the links.</source>
- <translation>Slutligen använder du dragmenyn för att ladda upp data och lägga till länkarna.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="171"/>
- <source>The data will be uploaded to %1, and be publicly available. Be sure you don't add private or confidential information.</source>
- <translation>Data laddas upp till %1 och är offentligt tillgängliga. Tillse att du inte lägger till privat eller konfidentiell information.</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="179"/>
- <source>List of files to upload</source>
- <translation>Lista över filer att ladda upp</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="187"/>
- <source>Upload Contents</source>
- <translation>Ladda upp innehåll</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="188"/>
- <source>Add Files</source>
- <translation>Lägg till filer</translation>
- </message>
- <message>
- <location filename="../qml/pages/FilePage.qml" line="189"/>
- <source>Collect Logs</source>
- <translation>Samla in loggar</translation>
- </message>
-</context>
-<context>
<name>GuideLabel</name>
<message>
<source>
@@ -205,37 +125,11 @@
Information about debugging and collecting logs can be found here:
-Jolla Log Collecting script: https://jolla.zendesk.com/hc/en-us/articles/360013910599
-
-Jolla article about logs for some special use cases: https://jolla.zendesk.com/hc/en-us/articles/4405752484242
-
-Other articles on log colection: https://jolla.zendesk.com/hc/en-us/search?utf8=✓&query=Logs
-
Testing: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
Wiki: https://forum.sailfishos.org/t/12751/3
</source>
- <translation>
-Läs riktlinjerna och följ mallen när du skapar en felrapport.
-
-Riktlinjer: https://forum.sailfishos.org/t/22
-
-Om du är osäker på hur du fyller i mallen rekommenderar vi att du först frågar om ditt problem, i forumets kategori Allmänt.
-
-Allmänt: https://forum.sailfishos.org/c/15
-
-Information om felsökning och insamling av loggar hittas här:
-
-Jollas logginsamlingsskript: https://jolla.zendesk.com/hc/en-us/articles/360013910599
-
-Jolla-artikel om loggar för vissa speciella användningsfall: https://jolla.zendesk.com/hc/en-us/articles/4405752484242
-
-Andra artiklar om logginsamling: https://jolla.zendesk.com/hc/en-us/search?utf8=✓&query=Logs
-
-Testning: https://docs.sailfishos.org/Develop/Platform/Testing_Advice/
-
-Wiki: https://forum.sailfishos.org/t/12751/3
-</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -247,131 +141,73 @@
</message>
</context>
<context>
- <name>LogGatherer</name>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="66"/>
- <source>Log gathering successsful!</source>
- <translation>Logginsamling slutförd!</translation>
- </message>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="69"/>
- <source>Log gathering failed!</source>
- <translation>Logginsamling misslyckades!</translation>
- </message>
- <message>
- <location filename="../qml/components/LogGatherer.qml" line="109"/>
- <source>Start</source>
- <translation>Starta</translation>
- </message>
-</context>
-<context>
- <name>LogPaster</name>
- <message>
- <location filename="../qml/components/LogPaster.qml" line="75"/>
- <source>Error uploading: %1 - %2</source>
- <comment>%1: error code, %2: error message</comment>
- <translation>Fel vid uppladdning: %1 - %2</translation>
- </message>
-</context>
-<context>
- <name>LogViewPage</name>
- <message>
- <location filename="../qml/pages/LogViewPage.qml" line="32"/>
- <source>Log File</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>LogfileDelegate</name>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="62"/>
- <source>uploaded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="62"/>
- <source>not uploaded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="70"/>
- <source>View</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qml/components/LogfileDelegate.qml" line="71"/>
- <source>Remove</source>
- <translation>Ta bort</translation>
- </message>
-</context>
-<context>
<name>MainPage</name>
<message>
- <location filename="../qml/pages/MainPage.qml" line="409"/>
+ <location filename="../qml/pages/MainPage.qml" line="396"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
- <location filename="../qml/pages/MainPage.qml" line="222"/>
+ <location filename="../qml/pages/MainPage.qml" line="219"/>
<source>Bug Info (%1)</source>
<translation>Felinformation (%1)</translation>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-bugger.yaml
^
|
@@ -1,7 +1,7 @@
Name: harbour-bugger
Summary: Bug reporting helper
-Version: 0.10.5
-Release: 1
+Version: 0.9.9
+Release: 2
Group: Applications
License: ASL 2.0
URL: https://github.com/sailfishos-chum/bugger
@@ -53,14 +53,12 @@
#Patches:
# - 'baz'
Requires:
- - '%{name}-gather-logs'
- libsailfishapp-launcher
- sailfish-version >= 4.0.0
PkgBR:
- qt5-qttools-linguist
- qt5-qmake
- sailfish-svg2png
- - systemd
- qml-rpm-macros
#PkgConfigBR:
# - ^^^
@@ -81,58 +79,3 @@
- '%dir %{_datadir}/%{name}'
- '%{_datadir}/%{name}/translations/*.qm'
- '%{_datadir}/%{name}/qml/*'
-
-SubPackages:
- - Name: gather-logs
- Summary: Log gathering tools from %{name}
- Group: Applications
- Description: |
- %{summary}.
-
- %if "%{?vendor}" == "chum"
- PackageName: Log collecting tools from Bugger!
- Type: addon
- Categories:
- - Utility
- Custom:
- Repo: https://github.com/sailfishos-chum/bugger
- %endif
-
- BuildArch: noarch
- AutoDepend: false
- Requires:
- - polkit
- RequiresPost:
- - systemd
- RequiresPreUn:
- - systemd
- RequiresPostUn:
- - systemd
- Files:
- - '%dir %{_datadir}/%{name}/scripts'
- - '%{_datadir}/%{name}/scripts/README_logcollect.md'
- - '%{_userunitdir}/*.target'
- - '%{_userunitdir}/*.service'
-
- - Name: gather-logs-contrib
- Version: 0.1
- Summary: Log gathering contributions for %{name}
- Group: Applications
- Description: |
- %{summary}.
-
- %if "%{?vendor}" == "chum"
- PackageName: Log collecting contributions for Bugger!
- Type: addon
- Categories:
- - Utility
- Custom:
- Repo: https://github.com/sailfishos-chum/bugger
- %endif
-
- Requires:
- - '%{name}-gather-logs'
- BuildArch: noarch
- AutoDepend: false
- Files:
- - '%attr(0755,root,root) %{_datadir}/%{name}/scripts/gather-logs-*.sh'
|