Remaked uploader module (base functions)

Add ability to upload to imgur.com (issue #4)

src/core/core.cpp

@@ -23,7 +23,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 
-#include "src/modules/uploader/uploader.h"
+#include "src/modules/uploader/moduleuploader.h"
 #include <QtCore/QChar>
 #include <QtCore/QBuffer>
 #include <QtCore/QFile>
@@ -453,8 +453,10 @@ void Core::autoSave()
 
 void Core::upload()
 {
-    Uploader *upl = new Uploader;
-    Q_UNUSED(upl)
+	//     Uploader *upl = new Uploader;
+	//     Q_UNUSED(upl)
+    ModuleUploader uploader;
+    uploader.init();
 }
 
 

src/modules/uploader/CMakeLists.txt

@@ -6,17 +6,24 @@ include_directories(${SG_INCLUDE})
 
 message(STATUS "SG_CORE_INCLUDE-2: " ${SG_INCLUDE})
 
-set (uploader_SRC uploader.cpp
-    uploaderdialog.cpp
+set (uploader_SRC 
+	moduleuploader.cpp
+	uploader.cpp
+    imgshack/uploader_imgshack.cpp
+	imgur/uploader_imgur.cpp
     uploaderconfig.cpp
+    dialoguploader.cpp
 )
 
 set (uploader_HDR
     uploader.h
-    uploaderdialog.h
+	imgshack/uploader_imgshack.h
+
+	imgur/uploader_imgur.h
+    dialoguploader.h
 )
 
-set(uploader_UI uploaderdialog.ui)
+set(uploader_UI dialoguploader.ui)
 
 qt4_wrap_cpp(uploader_SRC_MOC ${uploader_HDR})
 

src/modules/uploader/dialoguploader.cpp

@@ -0,0 +1,200 @@
+/***************************************************************************
+ *   Copyright (C) 2009 - 2012 by Artem 'DOOMer' Galichkin                        *
+ *   doomer3d@gmail.com                                                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "dialoguploader.h"
+#include "ui_dialoguploader.h"
+
+#include "imgshack/uploader_imgshack.h"
+#include "imgur/uploader_imgur.h"
+#include <core/core.h>
+
+#include <QtGui/QMessageBox>
+
+#include <QDebug>
+
+DialogUploader::DialogUploader(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogUploader)
+{
+    ui->setupUi(this);
+    ui->stackedWidget->setCurrentIndex(0);
+    uploader = 0;
+
+    ui->cbxUploaderList->addItems(UplConf.labelsList());
+    selectedHost = 0;
+
+    // load ishot preview
+    QSize imgSize = Core::instance()->getPixmap().size();
+    QString pixmapSize = tr("Size: ") + QString::number(imgSize.width()) + "x" + QString::number(imgSize.height()) + tr(" pixel");
+    ui->labImgSize->setText(pixmapSize);
+
+    ui->labImage->setFixedWidth(256);
+    ui->labImage->setFixedHeight(192);
+    ui->labImage->setPixmap(Core::instance()->getPixmap().scaled(ui->labImage->sizeHint()));
+
+    // progressbar
+    ui->progressBar->setVisible(false);
+    ui->progressBar->setFormat(tr("Uploaded ") + "%p%" + " (" + "%v" + " of " + "%m bytes");
+
+    // upload staus labelsList
+    ui->labUploadStatus->setText(tr("Ready to upload"));
+
+    connect(ui->butClose, SIGNAL(clicked(bool)), this, SLOT(close()));
+    connect(ui->butUpload, SIGNAL(clicked(bool)), this, SLOT(slotUploadStart()));
+    connect(ui->cbxUploaderList, SIGNAL(currentIndexChanged(int)), this, SLOT(slotSeletHost(int)));
+}
+
+DialogUploader::~DialogUploader()
+{
+    qDebug() << "delete dialog upload";
+
+    if (uploader != 0)
+    {
+        delete uploader;
+    }
+
+    delete ui;
+}
+
+void DialogUploader::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+
+void DialogUploader::slotUploadStart()
+{
+    qDebug() << "Upload slot call";
+    ui->progressBar->setVisible(true);
+    ui->butUpload->setEnabled(false);
+    ui->labUploadStatus->setText(tr("Upload preocessing... Please wait"));
+
+    switch(selectedHost)
+    {
+    case 0:
+        uploader = new Uploader_ImgUr;		
+        break;
+    case 1:
+        uploader = new Uploader_ImgShack;
+        break;
+    default:
+        uploader = new Uploader_ImgShack;
+    }
+
+    // start uploading process
+    connect(uploader, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(slotUploadProgress(qint64,qint64)));
+    uploader->startUploading();
+    connect(uploader, SIGNAL(uploadDone())	, this, SLOT(slotUploadDone()));
+    connect(uploader, SIGNAL(uploadFail(QByteArray)), this, SLOT(slotUploadFail(QByteArray)));
+    connect(ui->cbxExtCode, SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangeExtCode(int)));
+    connect(ui->butCopyLink, SIGNAL(clicked(bool)), this, SLOT(slotCopyLink()));
+	connect(ui->butCopyExtCode, SIGNAL(clicked(bool)), this, SLOT(slotCopyLink()));
+}
+
+void DialogUploader::slotSeletHost(int type)
+{
+    selectedHost = type;
+}
+
+void DialogUploader::slotUploadProgress(qint64 bytesSent, qint64 bytesTotal)
+{
+    qDebug() << "-- progress update" << bytesSent;
+    ui->progressBar->setMaximum(bytesTotal);
+    ui->progressBar->setValue(bytesSent);
+
+    if (bytesSent == bytesTotal)
+    {
+        qDebug() << "all is send!!!!";
+        ui->progressBar->setFormat(tr("Receiving a response from the server"));
+    }
+}
+
+void DialogUploader::slotUploadDone()
+{
+    QMap<QByteArray, ResultString_t> links = uploader->parsedLinks();
+
+    QMap<QByteArray, ResultString_t>::const_iterator iter;
+    for (iter = links.constBegin(); iter != links.constEnd(); ++iter)
+    {
+        if (iter.key() == "direct_link")
+        {
+            ui->editDirectLink->setText(iter.value().first);
+        }
+        else
+        {
+            ui->cbxExtCode->addItem(iter.value().second);
+        }
+    }
+
+    ui->stackedWidget->setCurrentIndex(1);
+    ui->labUploadStatus->setText(tr("Upload completed"));
+    ui->progressBar->setVisible(false);
+    ui->cbxUploaderList->setEnabled(false);
+    qDebug() << "upload is done";
+}
+
+void DialogUploader::slotUploadFail(const QByteArray& error)
+{
+    qDebug() << "upload failure";
+    QMessageBox msg(this);
+    msg.setText(tr("Error uploading screenshot"));
+    msg.setWindowTitle(tr("Error"));
+    msg.setIcon(QMessageBox::Critical);
+    msg.exec();
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->progressBar->setVisible(false);
+    ui->labUploadStatus->setText(tr("Ready to upload"));
+    ui->butUpload->setEnabled(true	);
+}
+
+void DialogUploader::slotChangeExtCode(int code)
+{
+    QMap<QByteArray, ResultString_t> links = uploader->parsedLinks();
+    links.remove("direct_link");
+    QList<QByteArray> keys = links.keys();
+    QByteArray selKey = keys.at(code);
+    ui->editExtCode->setText(links[selKey].first);
+}
+
+void DialogUploader::slotCopyLink()
+{
+	QString objName = sender()->objectName();
+	QString copyText;
+
+	if (objName == "butCopyLink")
+	{
+		copyText = ui->editDirectLink->text();
+	}
+
+	if (objName == "butCopyExtCode")
+	{
+		copyText = ui->editExtCode->text();
+	}
+
+	qApp->clipboard()->setText(copyText);
+}
+

src/modules/uploader/uploaderdialog.h → src/modules/uploader/dialoguploader.h

@@ -18,53 +18,46 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef UPLOADERDIALOG_H
-#define UPLOADERDIALOG_H
-
-#include <QtCore/QByteArray>
-#include <QtCore/QVector>
-#include <QtGui/QDialog>
+#ifndef DIALOGUPLOADER_H
+#define DIALOGUPLOADER_H
 
 #include "uploader.h"
+#include "uploaderconfig.h"
 
-class Uploader;
+#include <QtGui/QDialog>
 
 namespace Ui {
-    class UploaderDialog;
+class DialogUploader;
 }
 
-class UploaderDialog : public QDialog
+class DialogUploader : public QDialog
 {
     Q_OBJECT
+
 public:
-    explicit UploaderDialog(Uploader *uploader, QWidget* parent = 0);
-    ~UploaderDialog();
-
-protected:
-    void closeEvent ( QCloseEvent *e);
-
-private:
-    Ui::UploaderDialog *ui;
-    Uploader *loader;
-    QVector<QByteArray> extCodes;
+    explicit DialogUploader(QWidget *parent = 0);
+    ~DialogUploader();
 
-    void loadSettings();
-    inline void copyLink(const QString& link);
-
-public Q_SLOTS:
-    void updateProgerssbar(qint64 bytesSent, qint64 bytesTotal);
+protected:
+    void changeEvent(QEvent *e);
 
 private Q_SLOTS:
-    void uploadStart();
-    void uploadDone(const QVector<QByteArray>& resultStrings);
-    void uploadFailed(const QByteArray& errorCode);
+    void slotUploadStart();
+    void slotSeletHost(int type);
+	void slotUploadProgress(qint64 bytesSent, qint64 bytesTotal);
+	void slotUploadDone();
+	void slotUploadFail(const QByteArray &error);
+	void slotChangeExtCode(int code);
+	void slotCopyLink();
+
+private:
+    Ui::DialogUploader *ui;
 
-    void copyDirectLink();
-    void copyExtCode();
-    void changeExtCode(int code);
-    void showSettings();
+    Uploader* uploader;
 
-    void useAccount(bool use);
+    // storage id curren selected img sho
+    quint8 selectedHost;
+    UploaderConfig UplConf;
 };
 
-#endif // UPLOADERDIALOG_H
+#endif // DIALOGUPLOADER_H