Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-18 16:41:18 +02:00
Code Issues Projects Releases Wiki Activity

2020-03-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rddbmgr(8) that threw a SQL error when attempting
	to modify a DB containing tables set to use character set UTF-8
	to schema 297.
This commit is contained in:
Fred Gleason
2020-03-09 17:26:42 -04:00
parent 5eec2975d1
commit 7cbacda0e2
4 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
utils/rddbmgr/check.cpp
View File

@@ -41,6 +41,9 @@
#include "rddbmgr.h"
#define RDDBMGR_CHARSET_STRING "pRiKaZiDatFoO"
#define RDDBMGR_COLLATION_STRING "pRiKaZiDatBaR"
bool MainObject::Check(QString *err_msg)
{
if(GetCurrentSchema()!=RD_VERSION_DATABASE) {
@@ -222,6 +225,7 @@ void MainObject::RewriteTable(const QString &tblname,
const QString &new_charset,
const QString &new_collation)
{
QString err_msg;
QProcess *proc=NULL;
QStringList args;
QString tempdir=RDTempDir();
@@ -229,7 +233,9 @@ void MainObject::RewriteTable(const QString &tblname,
return;
}
QString filename=tempdir+"/table.sql";
QString temp_filename=tempdir+"/table-temp.sql";
QString temp1_filename=tempdir+"/table-temp1.sql";
QString temp2_filename=tempdir+"/table-temp2.sql";
QString temp3_filename=tempdir+"/table-temp3.sql";
QString out_filename=tempdir+"/table-out.sql";
/*
printf("table \"%s\" using: %s\n",
@@ -256,28 +262,36 @@ void MainObject::RewriteTable(const QString &tblname,
delete proc;
//
// Modify COLLATION
// Stage 1
//
args.clear();
args.push_back("s/"+old_collation+"/"+new_collation+"/g");
args.push_back(filename);
proc=new QProcess(this);
proc->setStandardOutputFile(temp_filename);
proc->start("sed",args);
proc->waitForFinished(-1);
delete proc;
if(!RewriteFile(filename,old_collation,
temp1_filename,RDDBMGR_COLLATION_STRING,
&err_msg)) {
fprintf(stderr,"rddbmgr: %s\n",err_msg.toUtf8().constData());
exit(1);
}
if(!RewriteFile(temp1_filename,old_charset,
temp2_filename,RDDBMGR_CHARSET_STRING,
&err_msg)) {
fprintf(stderr,"rddbmgr: %s\n",err_msg.toUtf8().constData());
exit(1);
}
//
// Modify CHARSET
// Stage 2
//
args.clear();
args.push_back("s/"+old_charset+"/"+new_charset+"/g");
args.push_back(temp_filename);
proc=new QProcess(this);
proc->setStandardOutputFile(out_filename);
proc->start("sed",args);
proc->waitForFinished(-1);
delete proc;
if(!RewriteFile(temp2_filename,RDDBMGR_COLLATION_STRING,
temp3_filename,new_collation,
&err_msg)) {
fprintf(stderr,"rddbmgr: %s\n",err_msg.toUtf8().constData());
exit(1);
}
if(!RewriteFile(temp3_filename,RDDBMGR_CHARSET_STRING,
out_filename,new_charset,
&err_msg)) {
fprintf(stderr,"rddbmgr: %s\n",err_msg.toUtf8().constData());
exit(1);
}
//
// Push Back Modified Table
@@ -293,18 +307,76 @@ void MainObject::RewriteTable(const QString &tblname,
proc->setStandardInputFile(out_filename);
proc->start("mysql",args);
proc->waitForFinished(-1);
if(proc->exitStatus()!=QProcess::NormalExit) {
fprintf(stderr,
"rddbmgr: \"mysql %s\" crashed when rewriting table \"%s\"\n",
args.join(" ").toUtf8().constData(),tblname.toUtf8().constData());
fprintf(stderr,"rddbmgr: source SQL data in \"%s\"\n",
out_filename.toUtf8().constData());
exit(1);
}
if(proc->exitCode()!=0) {
fprintf(stderr,
"rddbmgr: \"mysql %s\" returned exit code %d [%s] when rewriting table \"%s\"\n",
args.join(" ").toUtf8().constData(),
proc->exitCode(),proc->readAllStandardError().constData(),
tblname.toUtf8().constData());
fprintf(stderr,"rddbmgr: source SQL data in \"%s\"\n",
out_filename.toUtf8().constData());
exit(1);
}
delete proc;
//
// Clean Up
//
unlink(filename.toUtf8());
unlink(temp_filename.toUtf8());
unlink(temp1_filename.toUtf8());
unlink(temp2_filename.toUtf8());
unlink(temp3_filename.toUtf8());
unlink(out_filename.toUtf8());
rmdir(tempdir);
}
bool MainObject::RewriteFile(const QString &old_filename,
const QString &old_str,
const QString &new_filename,
const QString &new_str,
QString *err_msg)
{
QStringList args;
QProcess *proc=NULL;
args.clear();
args.push_back(QString("s/")+old_str+"/"+new_str+"/g");
args.push_back(old_filename);
proc=new QProcess(this);
proc->setStandardOutputFile(new_filename);
proc->start("sed",args);
proc->waitForFinished(-1);
if(proc->exitStatus()!=QProcess::NormalExit) {
*err_msg=QString("\"sed ")+args.join(" ")+"\" "+
"crashed when rewriting file \""+old_filename+"\" "+
"to \""+new_filename+"\"";
delete proc;
return false;
}
if(proc->exitCode()!=0) {
*err_msg=QString("\"sed ")+args.join(" ")+"\" "+
"returned exit code "+QString().sprintf("%d",proc->exitCode())+
"["+QString::fromUtf8(proc->readAllStandardError())+"] "+
" when rewriting file \""+old_filename+"\" "+
"to \""+new_filename+"\"";
delete proc;
return false;
}
delete proc;
return true;
}
void MainObject::RelinkAudio(const QString &srcdir) const
{
QString sql;

2
utils/rddbmgr/modify.cpp
View File

@@ -87,7 +87,7 @@ bool MainObject::ModifyCharset(const QString &charset,
while(q->next()) {
QStringList f0=q->value(1).toString().split("_");
QString prev_charset=f0.at(0);
if(q->value(1).toString().toLower()!=collation) {
if(q->value(1).toString().toLower()!=charset) {
RewriteTable(q->value(0).toString(),
prev_charset,q->value(1).toString(),charset,collation);
}

7
utils/rddbmgr/rddbmgr.h
View File

@@ -2,7 +2,7 @@
//
// Rivendell database management utility
//
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2020 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
@@ -22,8 +22,6 @@
#define RDDBMGR_H
#include <qobject.h>
//Added by qt3to4:
#include <QSqlQuery>
#include <rdconfig.h>
#include <rdstation.h>
@@ -47,6 +45,9 @@ class MainObject : public QObject
const QString &old_collation,
const QString &new_charset,
const QString &new_collation);
bool RewriteFile(const QString &old_filename,const QString &old_str,
const QString &new_filename,const QString &new_str,
QString *err_msg);
void RelinkAudio(const QString &srcdir) const;
void CheckOrphanedTracks() const;
void CheckCutCounts() const;