diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-08-04 10:10:38 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-08-04 10:10:38 +0200 |
commit | 030891531b9a0626502e6e2bbb9cd5dc6eb56d68 (patch) | |
tree | 8f9b81b55add5dca71352c77f0c2aa6b1c1df0f1 | |
parent | 210550d4b3937d24698ea052ba51b605fab3cfcd (diff) | |
download | serenity-030891531b9a0626502e6e2bbb9cd5dc6eb56d68.zip |
ChanViewer: Start working on a simple read-only 4Chan viewer
Since they are nice enough to provide a JSON API over HTTP, this makes
for a perfect way to exercise our networking code a bit. :^)
-rwxr-xr-x | Applications/ChanViewer/Makefile | 9 | ||||
-rw-r--r-- | Applications/ChanViewer/ThreadCatalogModel.cpp | 110 | ||||
-rw-r--r-- | Applications/ChanViewer/ThreadCatalogModel.h | 30 | ||||
-rw-r--r-- | Applications/ChanViewer/main.cpp | 25 | ||||
-rwxr-xr-x | Kernel/build-root-filesystem.sh | 2 | ||||
-rwxr-xr-x | Kernel/makeall.sh | 1 |
6 files changed, 177 insertions, 0 deletions
diff --git a/Applications/ChanViewer/Makefile b/Applications/ChanViewer/Makefile new file mode 100755 index 0000000000..65d01b6065 --- /dev/null +++ b/Applications/ChanViewer/Makefile @@ -0,0 +1,9 @@ +include ../../Makefile.common + +OBJS = \ + ThreadCatalogModel.o \ + main.o + +APP = ChanViewer + +include ../Makefile.common diff --git a/Applications/ChanViewer/ThreadCatalogModel.cpp b/Applications/ChanViewer/ThreadCatalogModel.cpp new file mode 100644 index 0000000000..5d3334507b --- /dev/null +++ b/Applications/ChanViewer/ThreadCatalogModel.cpp @@ -0,0 +1,110 @@ +#include "ThreadCatalogModel.h" +#include <AK/JsonArray.h> +#include <AK/JsonObject.h> +#include <AK/JsonValue.h> +#include <LibCore/CHttpRequest.h> +#include <LibCore/CNetworkJob.h> +#include <LibCore/CNetworkResponse.h> +#include <stdio.h> + +ThreadCatalogModel::ThreadCatalogModel() +{ + update(); +} + +ThreadCatalogModel::~ThreadCatalogModel() +{ +} + +void ThreadCatalogModel::update() +{ + CHttpRequest request; + request.set_hostname("a.4cdn.org"); + request.set_path("/g/catalog.json"); + + auto* job = request.schedule(); + + job->on_finish = [job, this](bool success) { + auto* response = job->response(); + dbg() << "job finished! success=" << success << ", response=" << response; + dbg() << "payload size: " << response->payload().size(); + + auto json = JsonValue::from_string(response->payload()); + + if (json.is_array()) { + JsonArray new_catalog; + + for (auto& page : json.as_array().values()) { + if (!page.is_object()) + continue; + auto threads_value = page.as_object().get("threads"); + if (!threads_value.is_array()) + continue; + for (auto& thread : threads_value.as_array().values()) { + new_catalog.append(thread); + } + } + + m_catalog = move(new_catalog); + } + + did_update(); + }; +} + +int ThreadCatalogModel::row_count(const GModelIndex&) const +{ + return m_catalog.size(); +} + +String ThreadCatalogModel::column_name(int column) const +{ + switch (column) { + case Column::ThreadNumber: + return "#"; + case Column::Text: + return "Text"; + case Column::ReplyCount: + return "Replies"; + case Column::ImageCount: + return "Images"; + default: + ASSERT_NOT_REACHED(); + } +} + +GModel::ColumnMetadata ThreadCatalogModel::column_metadata(int column) const +{ + switch (column) { + case Column::ThreadNumber: + return { 70, TextAlignment::CenterRight }; + case Column::Text: + return { 200, TextAlignment::CenterLeft }; + case Column::ReplyCount: + return { 45, TextAlignment::CenterRight }; + case Column::ImageCount: + return { 40, TextAlignment::CenterRight }; + default: + ASSERT_NOT_REACHED(); + } +} + +GVariant ThreadCatalogModel::data(const GModelIndex& index, Role role) const +{ + auto& thread = m_catalog.at(index.row()).as_object(); + if (role == Role::Display) { + switch (index.column()) { + case Column::ThreadNumber: + return thread.get("no").to_u32(); + case Column::Text: + return thread.get("com").to_string(); + case Column::ReplyCount: + return thread.get("replies").to_u32(); + case Column::ImageCount: + return thread.get("images").to_u32(); + default: + ASSERT_NOT_REACHED(); + } + } + return {}; +} diff --git a/Applications/ChanViewer/ThreadCatalogModel.h b/Applications/ChanViewer/ThreadCatalogModel.h new file mode 100644 index 0000000000..ce1e30fbeb --- /dev/null +++ b/Applications/ChanViewer/ThreadCatalogModel.h @@ -0,0 +1,30 @@ +#pragma once + +#include <AK/JsonArray.h> +#include <LibGUI/GModel.h> + +class ThreadCatalogModel final : public GModel { +public: + enum Column { + ThreadNumber, + Text, + ReplyCount, + ImageCount, + __Count, + }; + + static NonnullRefPtr<ThreadCatalogModel> create() { return adopt(*new ThreadCatalogModel); } + virtual ~ThreadCatalogModel() override; + + virtual int row_count(const GModelIndex& = GModelIndex()) const override; + virtual int column_count(const GModelIndex& = GModelIndex()) const override { return Column::__Count; } + virtual String column_name(int) const override; + virtual ColumnMetadata column_metadata(int) const override; + virtual GVariant data(const GModelIndex&, Role = Role::Display) const override; + virtual void update() override; + +private: + ThreadCatalogModel(); + + JsonArray m_catalog; +}; diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp new file mode 100644 index 0000000000..917df59be0 --- /dev/null +++ b/Applications/ChanViewer/main.cpp @@ -0,0 +1,25 @@ +#include "ThreadCatalogModel.h" +#include <LibGUI/GApplication.h> +#include <LibGUI/GBoxLayout.h> +#include <LibGUI/GTableView.h> +#include <LibGUI/GWindow.h> + +int main(int argc, char** argv) +{ + GApplication app(argc, argv); + + auto* window = new GWindow; + window->set_title("ChanViewer"); + window->set_rect(100, 100, 640, 480); + + auto* widget = new GWidget; + window->set_main_widget(widget); + widget->set_layout(make<GBoxLayout>(Orientation::Vertical)); + + auto* catalog_view = new GTableView(widget); + catalog_view->set_model(ThreadCatalogModel::create()); + + window->show(); + + return app.exec(); +} diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index 29b386b480..2751e23528 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -83,6 +83,7 @@ cp ../Applications/PaintBrush/PaintBrush mnt/bin/PaintBrush cp ../Applications/QuickShow/QuickShow mnt/bin/QuickShow cp ../Applications/Piano/Piano mnt/bin/Piano cp ../Applications/SystemDialog/SystemDialog mnt/bin/SystemDialog +cp ../Applications/ChanViewer/ChanViewer mnt/bin/ChanViewer cp ../Demos/HelloWorld/HelloWorld mnt/bin/HelloWorld cp ../Demos/HelloWorld2/HelloWorld2 mnt/bin/HelloWorld2 cp ../Demos/RetroFetch/RetroFetch mnt/bin/RetroFetch @@ -116,6 +117,7 @@ ln -s PaintBrush mnt/bin/pb ln -s QuickShow mnt/bin/qs ln -s Piano mnt/bin/pi ln -s SystemDialog mnt/bin/sd +ln -s ChanViewer mnt/bin/cv echo "done" # Run local sync script, if it exists diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh index 7b194612c1..2f48c23458 100755 --- a/Kernel/makeall.sh +++ b/Kernel/makeall.sh @@ -43,6 +43,7 @@ build_targets="$build_targets ../Applications/PaintBrush" build_targets="$build_targets ../Applications/QuickShow" build_targets="$build_targets ../Applications/Piano" build_targets="$build_targets ../Applications/SystemDialog" +build_targets="$build_targets ../Applications/ChanViewer" build_targets="$build_targets ../DevTools/VisualBuilder" build_targets="$build_targets ../Games/Minesweeper" build_targets="$build_targets ../Games/Snake" |