From b064a6cbb58a0db1a70fbac2e82242ce0c7509b1 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sat, 28 Nov 2020 20:47:28 +0100
Subject: rbutil: Rework and merge player and build server info handling.

Handling the data for players from rbutil.ini and the build-info data
from the server is closely related. Splitting things up into different
classes only creates tightly coupling, which is unnecessary, and the
need to differentiate between them in the application.

Merge both classes into a single one and rework handling so the
application doesn't have to deal with two separate classes anymore.

Furthermore, change URL templates to use new values from build-info
instead of hard coding them.

Change-Id: Ica550973ce23d1559110782add52bc214eba552d
---
 rbutil/rbutilqt/test/test-playerbuildinfo.pro | 35 +++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 rbutil/rbutilqt/test/test-playerbuildinfo.pro

(limited to 'rbutil/rbutilqt/test/test-playerbuildinfo.pro')

diff --git a/rbutil/rbutilqt/test/test-playerbuildinfo.pro b/rbutil/rbutilqt/test/test-playerbuildinfo.pro
new file mode 100644
index 0000000000..724da59162
--- /dev/null
+++ b/rbutil/rbutilqt/test/test-playerbuildinfo.pro
@@ -0,0 +1,35 @@
+#
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+#
+# All files in this archive are subject to the GNU General Public License.
+# See the file COPYING in the source tree root for full license agreement.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+
+#
+
+QT += testlib
+
+TEMPLATE = app
+TARGET = test-playerbuildinfo
+INCLUDEPATH += . ../base stubs
+
+# Input
+SOURCES += \
+    test-playerbuildinfo.cpp \
+    stubs/stubs-playerbuildinfo.cpp \
+    ../base/playerbuildinfo.cpp
+
+HEADERS += \
+    ../base/rbsettings.h \
+    ../base/rockboxinfo.h \
+    ../base/systeminfo.h \
+
+RESOURCES += ../rbutilqt.qrc
-- 
cgit v1.2.3