-fixed bug with md5sums in archiveeditdialog

git-svn-id: file:///var/svn/repos2/shemov/trunk@425 f440f766-f032-0410-8965-dc7d17de2ca0

1 files changed, 6 insertions, 7 deletions

diff --git a/archiveeditdialog.cpp b/archiveeditdialog.cpp
index b7b3fd3..667cfd9 100644
--- a/archiveeditdialog.cpp
+++ b/archiveeditdialog.cpp
@@ -96,7 +96,6 @@ void ArchiveEditDialog::setFiles(const QStringList &files){
 }
 
 void ArchiveEditDialog::archive(){
-	const QHash<QString, QString> md5 = mFileWidget->md5Sums();	
 	const QList<int> actors = mFileWidget->actorIds();
 	int genre = mFileWidget->genreId();
 	QString front = mCoverEditor->frontCover();
@@ -111,7 +110,7 @@ void ArchiveEditDialog::archive(){
 	files << front << back << general;
 	files.removeAll(QString());
 	files << file;
-	if(checkInput(genre, actors, files, title, file, quality) && checkMd5(md5, files)){
+	if(checkInput(genre, actors, files, title, file, quality)){
 		QSettings s;
 		QString archivePath = s.value("paths/archivedir").toString();
 		if(archivePath.isEmpty()){
@@ -131,16 +130,17 @@ void ArchiveEditDialog::archive(){
 		}
 		QList<QVariant> data;
 		QFileInfo movie(file);
-		data << title << movie.fileName() << md5.value(file) << movie.size() << genre << quality << -1 << seriesno << partno;
+		QString hash = Helper::md5Sum(file);
+		data << title << movie.fileName() << hash << movie.size() << genre << quality << -1 << seriesno << partno;
 		QList<CoverItem> covers;
 		if(!front.isEmpty()){
-			covers << coverItem(front, "front", md5.value(front));
+			covers << coverItem(front, "front", Helper::md5Sum(front));
 		}
 		if(!back.isEmpty()){
-			covers << coverItem(back, "back", md5.value(back));
+			covers << coverItem(back, "back", Helper::md5Sum(back));
 		}
 		if(!general.isEmpty()){
-			covers << coverItem(general, "general", md5.value(general));
+			covers << coverItem(general, "general", Helper::md5Sum(general));
 		}
 		QList<QVariant> vAList;
 		foreach(int a, actors){
@@ -150,7 +150,6 @@ void ArchiveEditDialog::archive(){
 		QStringList refreshDirs;
 		foreach(QString f, files){
 			QFileInfo file(f);
-			QString hash = md5.value(f);
 			QString destDirS = QString("%1/%2/%3").arg(archivePath).arg(hash[0]).arg(hash[1]);
 			QString destFileS = QString("%1/%2/%3/%4").arg(archivePath).arg(hash[0]).arg(hash[1]).arg(file.fileName());
 			QFileInfo dir(destDirS);