Changeset - 30dd8e7784b0
Parent rev.
Child rev.
[Not reviewed]
update-checker
0 4 2
Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-17 12:27:52
hy@ozderya.net
getting file list from bitbucket downloads page via api
6 files changed with 156 insertions and 3 deletions:
CMakeLists.txt
2
1
serialplot.pro
4
2
src/mainwindow.cpp
4
src/mainwindow.h
2
src/updatechecker.cpp
107
src/updatechecker.h
37
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -123,23 +123,24 @@ add_executable(${PROGRAM_NAME} WIN32
 
  src/asciireadersettings.cpp
 
  src/demoreader.cpp
 
  src/framedreader.cpp
 
  src/framedreadersettings.cpp
 
  src/plotmanager.cpp
 
  src/numberformat.cpp
 
  src/updatechecker.cpp
 
  misc/windows_icon.rc
 
  ${UI_FILES}
 
  ${RES_FILES}
 
  )
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




	
	
	
		
 
target_link_libraries(${PROGRAM_NAME}

			




	
	
	
		
 
  ${QWT_LIBRARY}

			




	
	
	
		
 
  ${QTCOLORWIDGETS_LIBRARIES}

			




	
	
	
		
 
  )

			




	
	
	
		
 
qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort)

			




	
	
	
		
 
qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Network)

			




	
	
	
		
 

			




	
	
	
		
 
if (BUILD_QWT)

			




	
	
	
		
 
  add_dependencies(${PROGRAM_NAME} QWT)

			




	
	
	
		
 
endif ()

			




	
	
	
		
 

			




	
	
	
		
 
if (BUILD_QTCOLORWIDGETS)

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -65,13 +65,14 @@ SOURCES += \

			




	
	
	
		
 
    src/asciireadersettings.cpp \

			




	
	
	
		
 
    src/asciireader.cpp \

			




	
	
	
		
 
    src/demoreader.cpp \

			




	
	
	
		
 
    src/framedreader.cpp \

			




	
	
	
		
 
    src/plotmanager.cpp \

			




	
	
	
		
 
    src/numberformat.cpp \

			




	
	
	
		
 
    src/recordpanel.cpp

			




	
	
	
		
 
    src/recordpanel.cpp \

			




	
	
	
		
 
    src/updatechecker.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
	
		
 
    src/utils.h \

			




	
	
	
		
 
    src/portcontrol.h \

			




	
	
	
		
 
    src/floatswap.h \

			




	
	
		
 
@@ -105,13 +106,14 @@ HEADERS += \

			




	
	
	
		
 
    src/asciireader.h \

			




	
	
	
		
 
    src/demoreader.h \

			




	
	
	
		
 
    src/framedreader.h \

			




	
	
	
		
 
    src/plotmanager.h \

			




	
	
	
		
 
    src/setting_defines.h \

			




	
	
	
		
 
    src/numberformat.h \

			




	
	
	
		
 
    src/recordpanel.h

			




	
	
	
		
 
    src/recordpanel.h \

			




	
	
	
		
 
    src/updatechecker.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
	
		
 
    src/about_dialog.ui \

			




	
	
	
		
 
    src/portcontrol.ui \

			




	
	
	
		
 
    src/snapshotview.ui \

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -57,12 +57,13 @@ const QMap<int, QString> panelSettingMap

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow),

			




	
	
	
		
 
    aboutDialog(this),

			




	
	
	
		
 
    portControl(&serialPort),

			




	
	
	
		
 
    channelMan(1, 1, this),

			




	
	
	
		
 
    updateChecker(this),

			




	
	
	
		
 
    snapshotMan(this, &channelMan),

			




	
	
	
		
 
    commandPanel(&serialPort),

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelMan, &recorder),

			




	
	
	
		
 
    recordPanel(&recorder, &channelMan)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
		
 
@@ -235,12 +236,15 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     this, &MainWindow::enableDemo);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     plotMan, &PlotManager::showDemoIndicator);

			




	
	
	
		
 

			




	
	
	
		
 
    // TEST UPDATE CHECKER

			




	
	
	
		
 
    updateChecker.checkUpdate();

			




	
	
	
		
 

			




	
	
	
		
 
    // load default settings

			




	
	
	
		
 
    QSettings settings("serialplot", "serialplot");

			




	
	
	
		
 
    loadAllSettings(&settings);

			




	
	
	
		
 

			




	
	
	
		
 
    // ensure command panel has 1 command if none loaded

			




	
	
	
		
 
    if (!commandPanel.numOfCommands())

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,12 +42,13 @@

			




	
	
	
		
 
#include "ui_about_dialog.h"

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "datarecorder.h"

			




	
	
	
		
 
#include "updatechecker.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class MainWindow : public QMainWindow

			




	
	
		
 
@@ -76,12 +77,13 @@ private:

			




	
	
	
		
 

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    ChannelManager channelMan;

			




	
	
	
		
 
    PlotManager* plotMan;

			




	
	
	
		
 
    SnapshotManager snapshotMan;

			




	
	
	
		
 
    DataRecorder recorder;       // operated by `recordPanel`

			




	
	
	
		
 
    UpdateChecker updateChecker;

			




	
	
	
		
 

			




	
	
	
		
 
    QLabel spsLabel;

			




	
	
	
		
 
    CommandPanel commandPanel;

			




	
	
	
		
 
    DataFormatPanel dataFormatPanel;

			




	
	
	
		
 
    RecordPanel recordPanel;

			




	
	
	
		
 
    PlotControlPanel plotControlPanel;

			




        

    


    
    

    

        

                

                    src/updatechecker.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
#include "updatechecker.h"

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include <QJsonDocument>

			




	
	
	
		
 
#include <QJsonObject>

			




	
	
	
		
 
#include <QJsonArray>

			




	
	
	
		
 
#include <QJsonValue>

			




	
	
	
		
 

			




	
	
	
		
 
// This returns the list of downloads in JSON format. Note that we only use the first

			




	
	
	
		
 
// page because results are sorted in new to old.

			




	
	
	
		
 
const char BB_DOWNLOADS_URL[] = "https://api.bitbucket.org/2.0/repositories/hyozd/serialplot/downloads?fields=values.name,values.links.self.href";

			




	
	
	
		
 

			




	
	
	
		
 
UpdateChecker::UpdateChecker(QObject *parent) :

			




	
	
	
		
 
    QObject(parent), nam(this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    connect(&nam, &QNetworkAccessManager::finished,

			




	
	
	
		
 
            this, &UpdateChecker::onReqFinished);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateChecker::checkUpdate()

			




	
	
	
		
 
{

			




	
	
	
		
 
    auto req = QNetworkRequest(QUrl(BB_DOWNLOADS_URL));

			




	
	
	
		
 
    nam.get(req);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateChecker::onReqFinished(QNetworkReply* reply)

			




	
	
	
		
 
{

			




	
	
	
		
 
    qDebug() << "finished";

			




	
	
	
		
 
    if (reply->error() != QNetworkReply::NoError)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        emit checkFailed(QString("Network error: ") + reply->errorString());

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QJsonParseError error;

			




	
	
	
		
 
        auto data = QJsonDocument::fromJson(reply->readAll(), &error);

			




	
	
	
		
 
        if (error.error != QJsonParseError::NoError)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            emit checkFailed(QString("JSon parsing error: ") + error.errorString());

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else

			




	
	
	
		
 
        {

			




	
	
	
		
 
            QList<FileInfo> files;

			




	
	
	
		
 
            if (!parseData(data, files))

			




	
	
	
		
 
            {

			




	
	
	
		
 
                // TODO: emit detailed data contents for logging

			




	
	
	
		
 
                emit checkFailed("Data parsing error.");

			




	
	
	
		
 
                qDebug() << "Data parsing error.";

			




	
	
	
		
 
            }

			




	
	
	
		
 
            else

			




	
	
	
		
 
            {

			




	
	
	
		
 
                for (auto f : files)

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    qDebug() << f.name << f.link;

			




	
	
	
		
 
                }

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    reply->deleteLater();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool UpdateChecker::parseData(const QJsonDocument& data, QList<FileInfo>& files)

			




	
	
	
		
 
{

			




	
	
	
		
 
    /* Data is expected to be in this form:

			




	
	
	
		
 

			




	
	
	
		
 
    {

			




	
	
	
		
 
       "values": [

			




	
	
	
		
 
       {

			




	
	
	
		
 
         "name": "serialplot-0.9.1-x86_64.AppImage",

			




	
	
	
		
 
         "links": {

			




	
	
	
		
 
           "self": {

			




	
	
	
		
 
             "href": "https://api.bitbucket.org/2.0/repositories/hyOzd/serialplot/downloads/serialplot-0.9.1-x86_64.AppImage"

			




	
	
	
		
 
            }

			




	
	
	
		
 
          }

			




	
	
	
		
 
       }, ... ]

			




	
	
	
		
 
    }

			




	
	
	
		
 
    */

			




	
	
	
		
 

			




	
	
	
		
 
    if (!data.isObject()) return false;

			




	
	
	
		
 

			




	
	
	
		
 
    auto values = data.object()["values"];

			




	
	
	
		
 
    if (values == QJsonValue::Undefined || !values.isArray()) return false;

			




	
	
	
		
 

			




	
	
	
		
 
    for (auto value : values.toArray())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        if (!value.isObject()) return false;

			




	
	
	
		
 

			




	
	
	
		
 
        auto name = value.toObject().value("name");

			




	
	
	
		
 
        if (name.isUndefined() || !name.isString())

			




	
	
	
		
 
             return false;

			




	
	
	
		
 

			




	
	
	
		
 
        auto links = value.toObject().value("links");

			




	
	
	
		
 
        if (links.isUndefined() || !links.isObject())

			




	
	
	
		
 
            return false;

			




	
	
	
		
 

			




	
	
	
		
 
        auto self = links.toObject().value("self");

			




	
	
	
		
 
        if (self.isUndefined() || !self.isObject())

			




	
	
	
		
 
            return false;

			




	
	
	
		
 

			




	
	
	
		
 
        auto href = self.toObject().value("href");

			




	
	
	
		
 
        if (href.isUndefined() || !href.isString())

			




	
	
	
		
 
            return false;

			




	
	
	
		
 

			




	
	
	
		
 
        files += {name.toString(), href.toString()};

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    return true;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/updatechecker.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
#ifndef UPDATECHECKER_H

			




	
	
	
		
 
#define UPDATECHECKER_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QObject>

			




	
	
	
		
 
#include <QNetworkAccessManager>

			




	
	
	
		
 
#include <QNetworkReply>

			




	
	
	
		
 
#include <QList>

			




	
	
	
		
 

			




	
	
	
		
 
class UpdateChecker : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit UpdateChecker(QObject *parent = 0);

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void updateFound();

			




	
	
	
		
 
    void checkFinished(bool found, QString newVersion, QString downloadUrl);

			




	
	
	
		
 
    void checkFailed(QString errorMessage);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    void checkUpdate();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    struct FileInfo

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QString name;

			




	
	
	
		
 
        QString link;

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    QNetworkAccessManager nam;

			




	
	
	
		
 
    bool parseData(const QJsonDocument& data, QList<FileInfo>& files);

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void onReqFinished(QNetworkReply* reply);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // UPDATECHECKER_H

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support