mirror of
https://github.com/libretro/RetroArch
synced 2025-03-18 04:21:19 +00:00
Merge pull request #14053 from libretro/qt-new-url
(Qt) Use new URL for scraping thumbnails
This commit is contained in:
commit
244ace9c9d
@ -34,11 +34,8 @@ extern "C" {
|
|||||||
#define TEMP_EXTENSION ".tmp"
|
#define TEMP_EXTENSION ".tmp"
|
||||||
#define THUMBNAILPACK_URL_HEADER "http://thumbnailpacks.libretro.com/"
|
#define THUMBNAILPACK_URL_HEADER "http://thumbnailpacks.libretro.com/"
|
||||||
#define THUMBNAILPACK_EXTENSION ".zip"
|
#define THUMBNAILPACK_EXTENSION ".zip"
|
||||||
#define THUMBNAIL_URL_HEADER "https://github.com/libretro-thumbnails/"
|
#define THUMBNAIL_URL_HEADER "https://thumbnails.libretro.com/"
|
||||||
#define THUMBNAIL_URL_BRANCH "/blob/master/"
|
|
||||||
#define THUMBNAIL_IMAGE_EXTENSION ".png"
|
#define THUMBNAIL_IMAGE_EXTENSION ".png"
|
||||||
#define THUMBNAIL_URL_FOOTER THUMBNAIL_IMAGE_EXTENSION "?raw=true"
|
|
||||||
|
|
||||||
|
|
||||||
static void extractThumbnailPackCB(retro_task_t *task,
|
static void extractThumbnailPackCB(retro_task_t *task,
|
||||||
void *task_data, void *user_data, const char *err)
|
void *task_data, void *user_data, const char *err)
|
||||||
@ -567,7 +564,6 @@ void MainWindow::downloadThumbnail(QString system, QString title, QUrl url)
|
|||||||
QNetworkRequest request;
|
QNetworkRequest request;
|
||||||
QByteArray urlArray;
|
QByteArray urlArray;
|
||||||
QString downloadType;
|
QString downloadType;
|
||||||
QString systemUnderscore = system;
|
|
||||||
QNetworkReply *reply = NULL;
|
QNetworkReply *reply = NULL;
|
||||||
const char *urlData = NULL;
|
const char *urlData = NULL;
|
||||||
settings_t *settings = config_get_ptr();
|
settings_t *settings = config_get_ptr();
|
||||||
@ -577,13 +573,11 @@ void MainWindow::downloadThumbnail(QString system, QString title, QUrl url)
|
|||||||
|
|
||||||
title = getScrubbedString(title);
|
title = getScrubbedString(title);
|
||||||
downloadType = m_pendingThumbnailDownloadTypes.takeFirst();
|
downloadType = m_pendingThumbnailDownloadTypes.takeFirst();
|
||||||
systemUnderscore = systemUnderscore.replace(" ", "_");
|
|
||||||
urlString = QString(THUMBNAIL_URL_HEADER)
|
urlString = QString(THUMBNAIL_URL_HEADER)
|
||||||
+ systemUnderscore
|
+ system + "/"
|
||||||
+ THUMBNAIL_URL_BRANCH
|
|
||||||
+ downloadType + "/"
|
+ downloadType + "/"
|
||||||
+ title
|
+ title
|
||||||
+ THUMBNAIL_URL_FOOTER;
|
+ THUMBNAIL_IMAGE_EXTENSION;
|
||||||
|
|
||||||
if (url.isEmpty())
|
if (url.isEmpty())
|
||||||
url = urlString;
|
url = urlString;
|
||||||
@ -855,7 +849,6 @@ void MainWindow::onPlaylistThumbnailDownloadReadyRead()
|
|||||||
void MainWindow::downloadNextPlaylistThumbnail(
|
void MainWindow::downloadNextPlaylistThumbnail(
|
||||||
QString system, QString title, QString type, QUrl url)
|
QString system, QString title, QString type, QUrl url)
|
||||||
{
|
{
|
||||||
QString systemUnderscore = system;
|
|
||||||
QString urlString;
|
QString urlString;
|
||||||
QNetworkRequest request;
|
QNetworkRequest request;
|
||||||
QNetworkReply *reply = NULL;
|
QNetworkReply *reply = NULL;
|
||||||
@ -865,16 +858,14 @@ void MainWindow::downloadNextPlaylistThumbnail(
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
title = getScrubbedString(title);
|
title = getScrubbedString(title);
|
||||||
systemUnderscore = systemUnderscore.replace(" ", "_");
|
|
||||||
|
|
||||||
urlString =
|
urlString =
|
||||||
QString(THUMBNAIL_URL_HEADER)
|
QString(THUMBNAIL_URL_HEADER)
|
||||||
+ systemUnderscore
|
+ system + "/"
|
||||||
+ THUMBNAIL_URL_BRANCH
|
|
||||||
+ type
|
+ type
|
||||||
+ "/"
|
+ "/"
|
||||||
+ title
|
+ title
|
||||||
+ THUMBNAIL_URL_FOOTER;
|
+ THUMBNAIL_IMAGE_EXTENSION;
|
||||||
|
|
||||||
if (url.isEmpty())
|
if (url.isEmpty())
|
||||||
url = urlString;
|
url = urlString;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user