Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
0 results Searching
Select Git revision
Loading items
Show changes

Commits on Source 125

25 additional commits have been omitted to prevent performance issues.
49 files
+ 867
− 712
Compare changes
  • Side-by-side
  • Inline

Files

.gitignore

+1 −1
Original line number Diff line number Diff line 
*.pro.user

build_*/

lib/qtlib/
 
lib/qtil/

.gitlab-ci.yml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
stages:

  - build



ubuntu_deb:

  stage: build

  image: ubuntu:14.04

  only:

    - master

    - /^release\-.+/

  script:

    - ./scripts/package ubuntu_deb

  artifacts:

    paths:

    - build_*/ocs-url*.deb

    expire_in: 2 days



fedora_rpm:

  stage: build

  image: fedora:20

  only:

    - master

    - /^release\-.+/

  script:

    - ./scripts/package fedora_rpm

  artifacts:

    paths:

    - build_*/RPMS/x86_64/ocs-url*.rpm

    expire_in: 2 days



opensuse_rpm:

  stage: build

  image: opensuse:42.3

  only:

    - master

    - /^release\-.+/

  script:

    - ./scripts/package opensuse_rpm

  artifacts:

    paths:

    - build_*/RPMS/x86_64/ocs-url*.rpm

    expire_in: 2 days



archlinux_pkg:

  stage: build

  image: archlinux/base:latest

  only:

    - master

    - /^release\-.+/

  script:

    - ./scripts/package archlinux_pkg

  artifacts:

    paths:

    - build_*/ocs-url*.pkg.tar.xz

    expire_in: 2 days

.travis.yml

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
dist: trusty

sudo: required

services:

  - docker



branches:

  only:

    - master



script:

  - mntdir='/mnt/ocs-url'

  - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh ubuntu"

  - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh fedora"

  - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh archlinux"

  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"

  #- docker run --rm -v $(pwd):${mntdir} --cap-add SYS_ADMIN --device /dev/fuse ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"

README.md

+4 −7
Original line number Diff line number Diff line 
# ocs-url



[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

[![Build Status](https://travis-ci.org/ocs-url/ocs-url.svg?branch=master)](https://travis-ci.org/ocs-url/ocs-url)



An install helper program for items served on OpenCollaborationServices (OCS).

An install helper program for items served via OpenCollaborationServices (ocs://).



Copyright: 2016-2017, Akira Ohgaki

Copyright: 2016-2019, Opendesktop.org



License: GPL-3+



Download Linux package from:



https://www.linux-apps.com/p/1136805/

https://www.opendesktop.org/p/1136805/



And please check the ocs-url wiki for more information.



https://github.com/ocs-url/ocs-url/wiki
 
And please see docs/* for more information.

app/app.pri

+3 −0
Original line number Diff line number Diff line 
CONFIG += c++11



QT += \

    core \

    gui \

    widgets \

    qml \

    quick \

    svg

app/configs/application.json

+7 −7
Original line number Diff line number Diff line 
{

    "id": "ocs-url",

    "name": "ocs-url",

    "version": "3.0.0",

    "organization": "ocs-url",

    "domain": "com.ocs-url.ocs-url",

    "version": "3.1.0",

    "organization": "Opendesktop.org",

    "domain": "org.opendesktop.ocs-url",

    "icon": ":/desktop/ocs-url.svg",

    "description": "An install helper program for items served on OpenCollaborationServices (OCS).",

    "description": "An install helper program for items served via OpenCollaborationServices (ocs://).",

    "license": "GPL-3+",

    "author": "Akira Ohgaki",

    "contact": "akiraohgaki@gmail.com",

    "homepage": "https://github.com/ocs-url/ocs-url"

    "author": "Opendesktop.org",

    "contact": "contact@opendesktop.org",

    "homepage": "https://git.opendesktop.org/akiraohgaki/ocs-url"

}

app/configs/install_types.json

+6 −6
Original line number Diff line number Diff line 
{

    "bin": {

        "name": "Softwares",

        "name": "Software",

        "destination": "$HOME/.local/bin",

        "generic_destination": "$APP_DATA/bin"

    },

    "downloads": {

        "name": "Downloads",

        "destination": "$HOME/Downloads",

        "destination": "$XDG_DOWNLOAD_DIR",

        "generic_destination": "$APP_DATA/downloads"

    },

    "documents": {

        "name": "Documents",

        "destination": "$HOME/Documents",

        "destination": "$XDG_DOCUMENTS_DIR",

        "generic_destination": "$APP_DATA/documents"

    },

    "pictures": {

        "name": "Pictures",

        "destination": "$HOME/Pictures",

        "destination": "$XDG_PICTURES_DIR",

        "generic_destination": "$APP_DATA/pictures"

    },

    "music": {

        "name": "Music",

        "destination": "$HOME/Music",

        "destination": "$XDG_MUSIC_DIR",

        "generic_destination": "$APP_DATA/music"

    },

    "videos": {

        "name": "Videos",

        "destination": "$HOME/Videos",

        "destination": "$XDG_VIDEOS_DIR",

        "generic_destination": "$APP_DATA/videos"

    },

    "wallpapers": {

app/qml/main.qml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ ApplicationWindow { 
        var metadata = ocsUrlHandler.metadata();



        var primaryMessages = {

            "success_download": qsTr("Download successfull"),

            "success_install": qsTr("Installation successfull"),

            "success_download": qsTr("Download successful"),

            "success_install": qsTr("Installation successful"),

            "error_validation": qsTr("Validation error"),

            "error_network": qsTr("Network error"),

            "error_save": qsTr("Saving file failed"),

app/src/handlers/confighandler.cpp

+55 −33
Original line number Diff line number Diff line 
#include "confighandler.h"



#include <QStringList>

#include <QStandardPaths>



#include "qtlib_dir.h"

#include "qtil_dir.h"



ConfigHandler::ConfigHandler(QObject *parent)

    : QObject(parent)

{

    appConfig_ = qtlib::Config(":/configs");

    appConfig_ = Qtil::Config(":/configs");

    importAppConfigApplication();

    importAppConfigInstallTypes();

}



QJsonObject ConfigHandler::getAppConfigApplication()

QJsonObject ConfigHandler::getAppConfigApplication() const

{

    if (appConfigApplication_.isEmpty()) {

        appConfigApplication_ = appConfig_.get("application");

    }

    return appConfigApplication_;

}



QJsonObject ConfigHandler::getAppConfigInstallTypes()

QJsonObject ConfigHandler::getAppConfigInstallTypes() const

{

    if (appConfigInstallTypes_.isEmpty()) {

        QJsonObject installTypes = appConfig_.get("install_types");

        foreach (const QString &key, installTypes.keys()) {

            QJsonObject installtype = installTypes[key].toObject();

    return appConfigInstallTypes_;

}



void ConfigHandler::importAppConfigApplication()

{

    appConfigApplication_ = appConfig_.get("application");

}



void ConfigHandler::importAppConfigInstallTypes()

{

    auto installTypes = appConfig_.get("install_types");

    for (const auto &key : installTypes.keys()) {

        auto installtype = installTypes[key].toObject();

        installtype["destination"] = convertPathString(installtype["destination"].toString());

        installtype["generic_destination"] = convertPathString(installtype["generic_destination"].toString());

        installTypes[key] = installtype;

    }

        QJsonObject installTypesAlias = appConfig_.get("install_types_alias");

        foreach (const QString &key, installTypesAlias.keys()) {

            QJsonObject installTypeAlias = installTypesAlias[key].toObject();

            QString baseKey = installTypeAlias["base"].toString();

    auto installTypesAlias = appConfig_.get("install_types_alias");

    for (const auto &key : installTypesAlias.keys()) {

        auto installTypeAlias = installTypesAlias[key].toObject();

        auto baseKey = installTypeAlias["base"].toString();

        if (installTypes.contains(baseKey)) {

                QJsonObject installType = installTypes[baseKey].toObject();

            auto installType = installTypes[baseKey].toObject();

            installType["base"] = baseKey;

            installType["name"] = installTypeAlias["name"].toString();

            installTypes[key] = installType;
@@ -41,23 +50,36 @@ QJsonObject ConfigHandler::getAppConfigInstallTypes() 
    }

    appConfigInstallTypes_ = installTypes;

}

    return appConfigInstallTypes_;

}



QString ConfigHandler::convertPathString(const QString &path)

QString ConfigHandler::convertPathString(const QString &path) const

{

    QString newPath = path;

    auto newPath = path;

    if (newPath.contains("$HOME")) {

        newPath.replace("$HOME", qtlib::Dir::homePath());

        newPath.replace("$HOME", Qtil::Dir::homePath());

    }

    else if (newPath.contains("$XDG_DOCUMENTS_DIR")) {

        newPath.replace("$XDG_DOCUMENTS_DIR", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));

    }

    else if (newPath.contains("$XDG_DOWNLOAD_DIR")) {

        newPath.replace("$XDG_DOWNLOAD_DIR", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));

    }

    else if (newPath.contains("$XDG_PICTURES_DIR")) {

        newPath.replace("$XDG_PICTURES_DIR", QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));

    }

    else if (newPath.contains("$XDG_MUSIC_DIR")) {

        newPath.replace("$XDG_MUSIC_DIR", QStandardPaths::writableLocation(QStandardPaths::MusicLocation));

    }

    else if (newPath.contains("$XDG_VIDEOS_DIR")) {

        newPath.replace("$XDG_VIDEOS_DIR", QStandardPaths::writableLocation(QStandardPaths::MoviesLocation));

    }

    else if (newPath.contains("$XDG_DATA_HOME")) {

        newPath.replace("$XDG_DATA_HOME", qtlib::Dir::genericDataPath());

        newPath.replace("$XDG_DATA_HOME", Qtil::Dir::genericDataPath());

    }

    else if (newPath.contains("$KDEHOME")) {

        newPath.replace("$KDEHOME", qtlib::Dir::kdehomePath());

        newPath.replace("$KDEHOME", Qtil::Dir::kdehomePath());

    }

    else if (newPath.contains("$APP_DATA")) {

        newPath.replace("$APP_DATA", qtlib::Dir::genericDataPath() + "/" + getAppConfigApplication()["id"].toString());

        newPath.replace("$APP_DATA", Qtil::Dir::genericDataPath() + "/" + getAppConfigApplication()["id"].toString());

    }

    return newPath;

}

app/src/handlers/confighandler.h

+8 −6
Original line number Diff line number Diff line
@@ -3,23 +3,25 @@ 
#include <QObject>

#include <QJsonObject>



#include "qtlib_config.h"

#include "qtil_config.h"



class ConfigHandler : public QObject

{

    Q_OBJECT



public:

    explicit ConfigHandler(QObject *parent = 0);

    explicit ConfigHandler(QObject *parent = nullptr);



public slots:

    QJsonObject getAppConfigApplication();

    QJsonObject getAppConfigInstallTypes();

    QJsonObject getAppConfigApplication() const;

    QJsonObject getAppConfigInstallTypes() const;



private:

    QString convertPathString(const QString &path);

    void importAppConfigApplication();

    void importAppConfigInstallTypes();

    QString convertPathString(const QString &path) const;



    qtlib::Config appConfig_;

    Qtil::Config appConfig_;

    QJsonObject appConfigApplication_;

    QJsonObject appConfigInstallTypes_;

};

app/src/handlers/ocsurlhandler.cpp

+23 −24
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
#include <QUrlQuery>

#include <QDesktopServices>



#include "qtlib_file.h"

#include "qtlib_dir.h"

#include "qtlib_networkresource.h"

#include "qtlib_package.h"

#include "qtil_file.h"

#include "qtil_dir.h"

#include "qtil_networkresource.h"

#include "qtil_package.h"



#include "handlers/confighandler.h"
@@ -39,15 +39,15 @@ void OcsUrlHandler::process() 
        return;

    }



    QString url = metadata_["url"].toString();

    qtlib::NetworkResource *resource = new qtlib::NetworkResource(url, QUrl(url), true, this);

    connect(resource, &qtlib::NetworkResource::downloadProgress, this, &OcsUrlHandler::downloadProgress);

    connect(resource, &qtlib::NetworkResource::finished, this, &OcsUrlHandler::networkResourceFinished);

    auto url = metadata_["url"].toString();

    auto *resource = new Qtil::NetworkResource(url, QUrl(url), true, this);

    connect(resource, &Qtil::NetworkResource::downloadProgress, this, &OcsUrlHandler::downloadProgress);

    connect(resource, &Qtil::NetworkResource::finished, this, &OcsUrlHandler::networkResourceFinished);

    resource->get();

    emit started();

}



bool OcsUrlHandler::isValid()

bool OcsUrlHandler::isValid() const

{

    QString scheme = metadata_["scheme"].toString();

    QString command = metadata_["command"].toString();
@@ -55,8 +55,7 @@ bool OcsUrlHandler::isValid() 
    QString type = metadata_["type"].toString();

    QString filename = metadata_["filename"].toString();



    // Still support xdg and xdgs schemes for backward compatibility

    if ((scheme == "ocs" || scheme == "ocss" || scheme == "xdg" || scheme == "xdgs")

    if ((scheme == "ocs" || scheme == "ocss")

            && (command == "download" || command == "install")

            && QUrl(url).isValid()

            && configHandler_->getAppConfigInstallTypes().contains(type)
@@ -66,13 +65,13 @@ bool OcsUrlHandler::isValid() 
    return false;

}



void OcsUrlHandler::openDestination()

void OcsUrlHandler::openDestination() const

{

    QString type = metadata_["type"].toString();

    auto type = metadata_["type"].toString();

    QDesktopServices::openUrl(QUrl("file://" + configHandler_->getAppConfigInstallTypes()[type].toObject()["destination"].toString()));

}



void OcsUrlHandler::networkResourceFinished(qtlib::NetworkResource *resource)

void OcsUrlHandler::networkResourceFinished(Qtil::NetworkResource *resource)

{

    if (!resource->isFinishedWithNoError()) {

        QJsonObject result;
@@ -127,14 +126,14 @@ void OcsUrlHandler::parse() 
    }

}



void OcsUrlHandler::saveDownloadedFile(qtlib::NetworkResource *resource)

void OcsUrlHandler::saveDownloadedFile(Qtil::NetworkResource *resource)

{

    QJsonObject result;



    QString type = metadata_["type"].toString();

    qtlib::Dir destDir(configHandler_->getAppConfigInstallTypes()[type].toObject()["destination"].toString());

    auto type = metadata_["type"].toString();

    Qtil::Dir destDir(configHandler_->getAppConfigInstallTypes()[type].toObject()["destination"].toString());

    destDir.make();

    qtlib::File destFile(destDir.path() + "/" + metadata_["filename"].toString());

    Qtil::File destFile(destDir.path() + "/" + metadata_["filename"].toString());



    if (!resource->saveData(destFile.path())) {

        result["status"] = QString("error_save");
@@ -151,11 +150,11 @@ void OcsUrlHandler::saveDownloadedFile(qtlib::NetworkResource *resource) 
    resource->deleteLater();

}



void OcsUrlHandler::installDownloadedFile(qtlib::NetworkResource *resource)

void OcsUrlHandler::installDownloadedFile(Qtil::NetworkResource *resource)

{

    QJsonObject result;



    qtlib::File tempFile(qtlib::Dir::tempPath() + "/" + metadata_["filename"].toString());

    Qtil::File tempFile(Qtil::Dir::tempPath() + "/" + metadata_["filename"].toString());



    if (!resource->saveData(tempFile.path())) {

        result["status"] = QString("error_save");
@@ -165,11 +164,11 @@ void OcsUrlHandler::installDownloadedFile(qtlib::NetworkResource *resource) 
        return;

    }



    qtlib::Package package(tempFile.path());

    QString type = metadata_["type"].toString();

    qtlib::Dir destDir(configHandler_->getAppConfigInstallTypes()[type].toObject()["destination"].toString());

    Qtil::Package package(tempFile.path());

    auto type = metadata_["type"].toString();

    Qtil::Dir destDir(configHandler_->getAppConfigInstallTypes()[type].toObject()["destination"].toString());

    destDir.make();

    qtlib::File destFile(destDir.path() + "/" + metadata_["filename"].toString());

    Qtil::File destFile(destDir.path() + "/" + metadata_["filename"].toString());



    if (type == "bin"

            && package.installAsProgram(destFile.path())) {