CoversWindow is almost done

* At least using the imperfectly suited GridLayout
* Moved image loading functionality into Utility.cpp/h

Author: axeld

CoverWindow.cpp

@@ -7,14 +7,17 @@
 
 #include <stdio.h>
 
+#include <Application.h>
 #include <Bitmap.h>
+#include <Button.h>
 #include <GridView.h>
 #include <LayoutBuilder.h>
 #include <ScrollView.h>
 #include <String.h>
 #include <TextControl.h>
 #include <TranslationUtils.h>
 
+#include "covers.h"
 #include "Query.h"
 #include "Utility.h"
 
@@ -24,7 +27,6 @@ static const uint32 kMaxColumns = 4;
 
 static const uint32 kMsgAddImage = 'adIm';
 static const uint32 kMsgQuery = 'quer';
-static const uint32 kMsgSelect = 'sele';
 
 
 class ImageLoaderResultListener : public ResultListener {
@@ -183,7 +185,7 @@ IconView::MouseDown(BPoint where)
 	if (count == 1)
 		SetSelected(!IsSelected());
 	else if (count == 2) {
-		BMessage select(kMsgSelect);
+		BMessage select(kMsgSelected);
 		select.AddString("id", fIdentifier);
 		select.AddString("image_url", fImageUrl);
 		Window()->PostMessage(&select);
@@ -247,6 +249,7 @@ CoverWindow::CoverWindow()
 {
 	fArtistControl = new BTextControl("Artist", "", new BMessage(kMsgQuery));
 	fTitleControl = new BTextControl("Title", "", new BMessage(kMsgQuery));
+	BButton* skipButton = new BButton("Skip", new BMessage(kMsgSkip));
 
 	fMainView = new BGridView("main");
 	fMainView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
@@ -260,8 +263,11 @@ CoverWindow::CoverWindow()
 			.SetInsets(B_USE_DEFAULT_SPACING)
 			.Add(fArtistControl)
 			.Add(fTitleControl)
+			.Add(skipButton)
 		.End()
 		.Add(scrollView);
+
+	fArtistControl->MakeFocus(true);
 }
 
 
@@ -292,9 +298,11 @@ CoverWindow::MessageReceived(BMessage* message)
 			}
 			break;
 		}
-		case kMsgSelect:
+		case kMsgSelected:
 		{
 			message->PrintToStream();
+			be_app->PostMessage(kMsgSelected);
+			PostMessage(B_QUIT_REQUESTED);
 			break;
 		}
 		case kMsgQuery:
@@ -310,6 +318,10 @@ CoverWindow::MessageReceived(BMessage* message)
 			fQuery->Run();
 			break;
 		}
+		case kMsgSkip:
+			be_app->PostMessage(kMsgSkip);
+			PostMessage(B_QUIT_REQUESTED);
+			break;
 		default:
 			BWindow::MessageReceived(message);
 			break;

Utility.cpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019 pinc Software. All Rights Reserved.
+ */
+
+
+#include "Utility.h"
+
+#include <Bitmap.h>
+#include <DataIO.h>
+#include <TranslationUtils.h>
+
+#include <stdio.h>
+
+
+BBitmap*
+FetchImage(const BUrl& url)
+{
+	BHttpRequest request(url);
+
+	DataListener listener;
+	request.SetListener(&listener);
+	request.Run();
+	while (request.IsRunning()) {
+		snooze(50000);
+		putchar('.');
+		fflush(stdout);
+	}
+
+	const BHttpResult& result = dynamic_cast<const BHttpResult&>(
+		request.Result());
+	printf("Status: %" B_PRId32 " d - %s\n", result.StatusCode(),
+		result.StatusText().String());
+
+	listener.IO().Seek(0, SEEK_SET);
+	return BTranslationUtils::GetBitmap(&listener.IO());
+}

Utility.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019 pinc Software. All Rights Reserved.
+ */
+#ifndef UTILITY_H
+#define UTILITY_H
+
+
+#include <HttpRequest.h>
+
+
+class BBitmap;
+
+
+class DataListener : public BUrlProtocolListener {
+public:
+	DataListener()
+	{
+	}
+
+	virtual ~DataListener()
+	{
+	}
+
+	virtual void DataReceived(BUrlRequest* request, const char* data,
+		off_t offset, ssize_t size)
+	{
+		fResult.Write(data, size);
+	}
+
+	BMallocIO& IO() { return fResult; }
+
+private:
+	BMallocIO fResult;
+};
+
+
+BBitmap* FetchImage(const BUrl& url);
+
+
+#endif // UTILITY_H

covers.cpp

@@ -4,6 +4,8 @@
  */
 
 
+#include "covers.h"
+
 #include <Application.h>
 #include <Bitmap.h>
 #include <DataIO.h>
@@ -14,163 +16,52 @@
 #include <stdio.h>
 
 #include "CoverWindow.h"
+#include "Utility.h"
 
 
-#define MAX_GROUPS 10
-#define MAX_MATCHES 10
-
-#define COUNTRY_GERMANY 3
-
-#define TYPE_ORIGINAL "SCRM"
-#define TYPE_LARGE "SCL"
-#define TYPE_THUMB "THUMB"
-
-
-class DataListener : public BUrlProtocolListener {
+class CoversApplication : public BApplication {
 public:
-	DataListener()
-	{
-	}
+								CoversApplication();
+	virtual						~CoversApplication();
 
-	virtual ~DataListener()
-	{
-	}
-
-	virtual void DataReceived(BUrlRequest* request, const char* data,
-		off_t offset, ssize_t size)
-	{
-		fResult.Write(data, size);
-	}
-
-	BMallocIO& IO() { return fResult; }
-
-private:
-	BMallocIO fResult;
+	virtual	void				MessageReceived(BMessage* message);
 };
 
 
-BBitmap*
-loadImage(int countryCode, const BString& id, const char* type)
+CoversApplication::CoversApplication()
+	:
+	BApplication("application/x-vnd.pinc-covers")
 {
-	BString urlString;
-	urlString.SetToFormat("http://ecx.images-amazon.com/images/P/%s.%02d._%s_",
-		id.String(), countryCode, type);
-
-	BUrl url(urlString.String());
-	BHttpRequest request(url);
-
-	DataListener listener;
-	request.SetListener(&listener);
-	request.Run();
-	while (request.IsRunning()) {
-		snooze(50000);
-		putchar('.');
-		fflush(stdout);
-	}
+}
 
-	const BHttpResult& result = dynamic_cast<const BHttpResult&>(
-		request.Result());
-	printf("Status: %" B_PRId32 " d - %s\n", result.StatusCode(),
-		result.StatusText().String());
 
-	listener.IO().Seek(0, SEEK_SET);
-	return BTranslationUtils::GetBitmap(&listener.IO());
+CoversApplication::~CoversApplication()
+{
 }
 
 
 void
-getImageFromAmazon(const char* country, int countryCode, const BString& artist,
-	const BString& title)
+CoversApplication::MessageReceived(BMessage* message)
 {
-	BString pattern("<a[^>]*title\\s*=\\s*\"([^\"]+)\"[^>]*"
-		"href\\s*=\\s*\"([^\"]+?/dp/([^/]+)/)[^>]+><h2.*?>([^<]+)(</a>)?</span></div></div>");
-	//");
-	regex_t patternCompiled;
-	regmatch_t groups[MAX_GROUPS];
-	int patternResult = regcomp(&patternCompiled, pattern.String(),
-		REG_EXTENDED | REG_ICASE);
-	if (patternResult != 0) {
-		printf("bad pattern: %d!\n", patternResult);
-		char text[256];
-		regerror(patternResult, &patternCompiled, text, sizeof(text));
-		printf(" --> %s\n", text);
-		return;
-	}
-
-	BString urlString("http://www.amazon.%COUNTRY%/gp/search/"
-		"?search-alias=popular&sort=relevancerank");
-	if (!artist.IsEmpty())
-		urlString += "&field-artist=%ARTIST%";
-	if (!title.IsEmpty())
-		urlString += "&field-title=%TITLE%";
-	urlString.ReplaceAll("%COUNTRY%", country);
-	urlString.ReplaceAll("%ARTIST%", BUrl::UrlEncode(artist));
-	urlString.ReplaceAll("%TITLE%", BUrl::UrlEncode(title));
-	printf("URL: %s\n", urlString.String());
-
-	BUrl url(urlString);
-	BHttpRequest request(url);
-
-	DataListener listener;
-	request.SetListener(&listener);
-	request.Run();
-	while (request.IsRunning()) {
-		snooze(50000);
-		putchar('.');
-		fflush(stdout);
-	}
-
-	const BHttpResult& result = dynamic_cast<const BHttpResult&>(
-		request.Result());
-	printf("Status: %" B_PRId32 " - %s\n", result.StatusCode(),
-		result.StatusText().String());
-
-	BString data((const char*)listener.IO().Buffer(),
-		listener.IO().BufferLength());
-	printf("length: %d\n", (int)listener.IO().BufferLength());
-	const char* cursor = data.String();
-	int offset = 0;
-
-	for (int index = 0; index < MAX_MATCHES; index++) {
-		if (regexec(&patternCompiled, cursor, MAX_GROUPS, groups, 0))
+	switch (message->what) {
+		case kMsgSelected:
+		case kMsgSkip:
+			message->PrintToStream();
+			break;
+		default:
+			BApplication::MessageReceived(message);
 			break;
-
-		BString id;
-
-		for (int groupIndex = 0; groupIndex < MAX_GROUPS; groupIndex++) {
-			if (groups[groupIndex].rm_so == -1)
-				break;
-			if (groupIndex == 0)
-				offset = groups[0].rm_eo;
-
-			int length = groups[groupIndex].rm_eo - groups[groupIndex].rm_so;
-			BString match(cursor + groups[groupIndex].rm_so, length);
-			if (groupIndex)
-				printf("%d: match? %s\n", groupIndex, match.String());
-			if (groupIndex == 3)
-				id = match;
-		}
-
-		if (!id.IsEmpty()) {
-			BBitmap* bitmap = loadImage(COUNTRY_GERMANY, id, TYPE_ORIGINAL);
-			if (bitmap != NULL)
-				puts("got image!");
-			else
-				puts("nay!");
-		}
-
-printf("offset = %d\n", offset);
-		cursor += offset;
 	}
-	regfree(&patternCompiled);
 }
 
 
+// #pragma mark -
+
+
 int
 main()
 {
-	BApplication application("application/x-vnd.pinc-covers");
-//	getImageFromAmazon("de", COUNTRY_GERMANY, "toundra", "");
+	CoversApplication application;
 
 	BWindow* window = new CoverWindow();
 	window->CenterOnScreen();

covers.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2019 pinc Software. All Rights Reserved.
+ */
+#ifndef COVERS_H
+#define COVERS_H
+
+
+#include <SupportDefs.h>
+
+
+static const uint32 kMsgSelected = 'sele';
+static const uint32 kMsgSkip = 'skip';
+
+
+#endif // COVERS_H