Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 15:16:07 +01:00
Code Issues Projects Releases Wiki Activity

2018-02-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the RDUpload class to use RDApplication.
This commit is contained in:
Fred Gleason
2018-02-06 07:29:11 -05:00
parent ed4fe367a8
commit 2df78cb26d
8 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tests/upload_test.cpp
View File

@@ -18,22 +18,64 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <qapplication.h>
#include <rdapplication.h>
#include <rddb.h>
#include <rdcmd_switch.h>
//#include <rdcmd_switch.h>
#include <rdupload.h>
#include <upload_test.h>
#include "upload_test.h"
MainObject::MainObject(QObject *parent)
:QObject(parent)
{
QString err_msg;
username="";
password="";
RDUpload::ErrorCode conv_err;
unsigned schema=0;
//
// Open the Database
//
rda=new RDApplication("upload_test","upload_test",UPLOAD_TEST_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"upload_test: %s\n",(const char *)err_msg);
exit(1);
}
//
// Read Command Options
//
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(rda->cmdSwitch()->key(i)=="--username") {
username=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--password") {
password=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--source-file") {
source_filename=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--destination-url") {
destination_url=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdrepld: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
exit(2);
}
}
/*
//
// Read Command Options
//
@@ -58,6 +100,11 @@ MainObject::MainObject(QObject *parent)
cmd->setProcessed(i,true);
}
}
*/
//
// Sanity Checks
//
if(source_filename.isEmpty()) {
fprintf(stderr,"upload_test: missing source-file\n");
exit(256);
@@ -66,7 +113,7 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"upload_test: missing destination-url\n");
exit(256);
}
/*
//
// Read Configuration
//
@@ -84,12 +131,16 @@ MainObject::MainObject(QObject *parent)
delete cmd;
exit(256);
}
RDUpload *conv=new RDUpload(rdconfig,this);
*/
//
// Run the Test
//
RDUpload *conv=new RDUpload(this);
conv->setSourceFile(source_filename);
conv->setDestinationUrl(destination_url);
printf("Uploading...\n");
conv_err=conv->runUpload(username,password,rdconfig->logXloadDebugData());
conv_err=conv->
runUpload(username,password,rda->config()->logXloadDebugData());
printf("Result: %s\n",(const char *)RDUpload::errorText(conv_err));
delete conv;

12
tests/upload_test.h
View File

@@ -2,7 +2,7 @@
//
// Test Rivendell file uploading
//
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010,2016-2018 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -24,19 +24,9 @@
#include <list>
#include <qobject.h>
#include <qsqldatabase.h>
#include <rdconfig.h>
#include <rdcmd_switch.cpp>
#define UPLOAD_TEST_USAGE "[options]\n\nTest the Rivendell upload routines\n\nOptions are:\n--username=<username>\n\n--password=<password>\n\n--source-file=<filename>\n\n--destination-url=<url>\n\n"
//
// Global Variables
//
RDConfig *rdconfig;
class MainObject : public QObject
{
public: