From bd861bbff12fda4516ce0eb20a649f2dcd7334e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20Morschh=C3=A4user?= Date: Sun, 21 Apr 2013 15:53:27 +0200 Subject: [PATCH 1/3] Removed two unused variables. --- oracle/src/oracleimporter.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 6b903ca6..dbcf782c 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -44,7 +44,6 @@ bool OracleImporter::readSetsFromXml(QXmlStreamReader &xml) if (xml.readNext() == QXmlStreamReader::EndElement) break; if (xml.name() == "set") { - QString shortName, longName; bool import = xml.attributes().value("import").toString().toInt(); while (!xml.atEnd()) { if (xml.readNext() == QXmlStreamReader::EndElement) From b179f446f52880131fb32d1fe2baa267047e2b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20Morschh=C3=A4user?= Date: Sun, 21 Apr 2013 17:30:08 +0200 Subject: [PATCH 2/3] Get sets.xml directly from github. --- oracle/src/window_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oracle/src/window_main.cpp b/oracle/src/window_main.cpp index 9f2923f0..98b64891 100644 --- a/oracle/src/window_main.cpp +++ b/oracle/src/window_main.cpp @@ -19,7 +19,7 @@ #include "window_main.h" #include "oracleimporter.h" -const QString WindowMain::defaultSetsUrl = QString("http://www.cockatrice.de/files/sets.xml"); +const QString WindowMain::defaultSetsUrl = QString("https://raw.github.com/Daenyth/Cockatrice/master/doc/sets.xml"); WindowMain::WindowMain(QWidget *parent) : QMainWindow(parent) From 8bd247e681452dfe04c2dc09ba6a7872e7086ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20Morschh=C3=A4user?= Date: Sun, 21 Apr 2013 17:31:07 +0200 Subject: [PATCH 3/3] Fixed spoiler list parsing, oracle works again. --- oracle/src/oracleimporter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index dbcf782c..c717956c 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -193,7 +193,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QByteArray &data) QString v1 = tds.at(0).toElement().text().simplified(); QString v2 = tds.at(1).toElement().text().replace(trUtf8("—"), "-"); - if (v1 == "Name:") { + if (v1 == "Name") { QDomElement a = tds.at(1).toElement().elementsByTagName("a").at(0).toElement(); QString href = a.attributes().namedItem("href").nodeValue(); cardId = href.mid(href.indexOf("multiverseid=") + 13).toInt(); @@ -258,6 +258,7 @@ void OracleImporter::downloadNextFile() if (urlString.isEmpty()) urlString = setUrl; urlString = urlString.replace("!longname!", setsToDownload[setIndex].getLongName()); + if (urlString.startsWith("http://")) { QUrl url(urlString); http->setHost(url.host(), QHttp::ConnectionModeHttp, url.port() == -1 ? 0 : url.port());