| + {% else %} + | + {{ versus_string(fontsize='+{}'.format(1 + (((teams[0])|length + (teams[1])|length)/2)|int)) }} + {% endif %} + {% endfor %} + | ||
| + Observers: + {% for observer in observers %} + {{ observertooltip(observer) }} + {% endfor %} + | +|||
| + {{ modtip(mods) }} + | +
| Author: {author} |
| Downloads: {downloads} |
| Played: {played} times |
| {likes} Liked this |
| Uploaded {date} |
-{description} -
-| Author: {author} |
| Downloads: {downloads} |
| {likes} Liked this |
| Uploaded {date} |
+{description} +
+| Size: {width} x {height} km |
| Rating: {rating} ({reviews}) |
| Uploaded: {date} |
{text} -
\ No newline at end of file + diff --git a/res/modvault/mod.ui b/res/vaults/modvault/mod.ui similarity index 100% rename from res/modvault/mod.ui rename to res/vaults/modvault/mod.ui diff --git a/res/vaults/modvault/modinfo.qthtml b/res/vaults/modvault/modinfo.qthtml new file mode 100644 index 000000000..067884c52 --- /dev/null +++ b/res/vaults/modvault/modinfo.qthtml @@ -0,0 +1,14 @@ +{title} V{version} + +{modtype} ++{description} +
+| Author: {author} |
| Rating: {rating} ({reviews}) |
| Uploaded {date} |
{description}
- \ No newline at end of file + diff --git a/res/modvault/uimod.ui b/res/vaults/modvault/uimod.ui similarity index 100% rename from res/modvault/uimod.ui rename to res/vaults/modvault/uimod.ui diff --git a/res/modvault/upload.ui b/res/vaults/modvault/upload.ui similarity index 100% rename from res/modvault/upload.ui rename to res/vaults/modvault/upload.ui diff --git a/res/vaults/vault.ui b/res/vaults/vault.ui new file mode 100644 index 000000000..9d85f4fc7 --- /dev/null +++ b/res/vaults/vault.ui @@ -0,0 +1,532 @@ + +'+self.selectedItem.name+'
%s
' % self.description) - - def __ge__(self, other): - return not self.__lt__(self, other) - - def __lt__(self, other): - if self.parent.sortType == "alphabetical": - if self.name.lower() == other.name.lower(): - return self.uid < other.uid - return self.name.lower() > other.name.lower() - elif self.parent.sortType == "rating": - if self.likes == other.likes: - return self.downloads < other.downloads - return self.likes < other.likes - elif self.parent.sortType == "downloads": - if self.downloads == other.downloads: - return self.date < other.date - return self.downloads < other.downloads - elif self.parent.sortType == "date": - # guard - if self.date is None: - return other.date is not None - if self.date == other.date: - return self.name.lower() < other.name.lower() - return self.date < other.date diff --git a/src/modvault/modwidget.py b/src/modvault/modwidget.py deleted file mode 100644 index 55cb914e2..000000000 --- a/src/modvault/modwidget.py +++ /dev/null @@ -1,168 +0,0 @@ - -import urllib.request, urllib.error, urllib.parse - -from PyQt5 import QtCore, QtWidgets, QtGui - -from util import strtodate, datetostr, now -import util - -FormClass, BaseClass = util.THEME.loadUiType("modvault/mod.ui") - - -class ModWidget(FormClass, BaseClass): - def __init__(self, parent, mod, *args, **kwargs): - BaseClass.__init__(self, *args, **kwargs) - - self.setupUi(self) - self.parent = parent - - self.setStyleSheet(self.parent.client.styleSheet()) - - self.setWindowTitle(mod.name) - - self.mod = mod - - self.Title.setText(mod.name) - self.Description.setText(mod.description) - modtext = "" - if mod.isuimod: modtext = "UI mod\n" - self.Info.setText(modtext + "By %s\nUploaded %s" % (mod.author, str(mod.date))) - if mod.thumbnail is None: - self.Picture.setPixmap(util.THEME.pixmap("games/unknown_map.png")) - else: - self.Picture.setPixmap(mod.thumbnail.pixmap(100, 100)) - - #self.Comments.setItemDelegate(CommentItemDelegate(self)) - #self.BugReports.setItemDelegate(CommentItemDelegate(self)) - - self.tabWidget.setEnabled(False) - - if self.mod.uid in self.parent.uids: - self.DownloadButton.setText("Remove Mod") - self.DownloadButton.clicked.connect(self.download) - - #self.likeButton.clicked.connect(self.like) - #self.LineComment.returnPressed.connect(self.addComment) - #self.LineBugReport.returnPressed.connect(self.addBugReport) - - #for item in mod.comments: - # comment = CommentItem(self,item["uid"]) - # comment.update(item) - # self.Comments.addItem(comment) - #for item in mod.bugreports: - # comment = CommentItem(self,item["uid"]) - # comment.update(item) - # self.BugReports.addItem(comment) - - self.likeButton.setEnabled(False) - self.LineComment.setEnabled(False) - self.LineBugReport.setEnabled(False) - - @QtCore.pyqtSlot() - def download(self): - if self.mod.uid not in self.parent.uids: - self.parent.downloadMod(self.mod) - self.done(1) - else: - show = QtWidgets.QMessageBox.question(self.parent.client, "Delete Mod", - "Are you sure you want to delete this mod?", - QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No) - if show == QtWidgets.QMessageBox.Yes: - self.parent.removeMod(self.mod) - self.done(1) - - @QtCore.pyqtSlot() - def addComment(self): - if self.LineComment.text() == "": - return - comment = {"author": self.parent.client.login, "text": self.LineComment.text(), - "date": datetostr(now()), "uid": "%s-%s" % (self.mod.uid, str(len(self.mod.bugreports) + - len(self.mod.comments)).zfill(3))} - - self.parent.client.lobby_connection.send(dict(command="modvault", type="addcomment", moduid=self.mod.uid, - comment=comment)) - c = CommentItem(self, comment["uid"]) - c.update(comment) - self.Comments.addItem(c) - self.mod.comments.append(comment) - self.LineComment.setText("") - - @QtCore.pyqtSlot() - def addBugReport(self): - if self.LineBugReport.text() == "": - return - bugreport = {"author": self.parent.client.login, "text": self.LineBugReport.text(), - "date": datetostr(now()), "uid": "%s-%s" % (self.mod.uid, str(len(self.mod.bugreports) + - len(self.mod.comments)).zfill(3))} - - self.parent.client.lobby_connection.send(dict(command="modvault", type="addbugreport", moduid=self.mod.uid, - bugreport=bugreport)) - c = CommentItem(self, bugreport["uid"]) - c.update(bugreport) - self.BugReports.addItem(c) - self.mod.bugreports.append(bugreport) - self.LineBugReport.setText("") - - @QtCore.pyqtSlot() - def like(self): # the server should determine if the user hasn't already clicked the like button for this mod. - self.parent.client.lobby_connection.send(dict(command="modvault", type="like", uid=self.mod.uid)) - self.likeButton.setEnabled(False) - - -class CommentItemDelegate(QtWidgets.QStyledItemDelegate): - TEXTWIDTH = 350 - TEXTHEIGHT = 60 - - def __init__(self, *args, **kwargs): - QtWidgets.QStyledItemDelegate.__init__(self, *args, **kwargs) - - def paint(self, painter, option, index, *args, **kwargs): - self.initStyleOption(option, index) - - painter.save() - - html = QtGui.QTextDocument() - html.setHtml(option.text) - - option.text = "" - option.widget.style().drawControl(QtWidgets.QStyle.CE_ItemViewItem, option, painter, option.widget) - - # Description - painter.translate(option.rect.left() + 10, option.rect.top()+10) - clip = QtCore.QRectF(0, 0, option.rect.width(), option.rect.height()) - html.drawContents(painter, clip) - - painter.restore() - - def sizeHint(self, option, index, *args, **kwargs): - self.initStyleOption(option, index) - - html = QtGui.QTextDocument() - html.setHtml(option.text) - html.setTextWidth(self.TEXTWIDTH) - return QtCore.QSize(self.TEXTWIDTH, self.TEXTHEIGHT) - - -class CommentItem(QtWidgets.QListWidgetItem): - FORMATTER_COMMENT = str(util.THEME.readfile("modvault/comment.qthtml")) - - def __init__(self, parent, uid, *args, **kwargs): - QtWidgets.QListWidgetItem.__init__(self, *args, **kwargs) - - self.parent = parent - self.uid = uid - self.text = "" - self.author = "" - self.date = None - - def update(self, dic): - self.text = dic["text"] - self.author = dic["author"] - self.date = strtodate(dic["date"]) - self.setText(self.FORMATTER_COMMENT.format(text=self.text, author=self.author, date=str(self.date))) - - def __ge__(self, other): - return self.date > other.date - - def __lt__(self, other): - return self.date <= other.date diff --git a/src/modvault/uimodwidget.py b/src/modvault/uimodwidget.py deleted file mode 100644 index 06c3f1f45..000000000 --- a/src/modvault/uimodwidget.py +++ /dev/null @@ -1,55 +0,0 @@ - -import urllib.request, urllib.error, urllib.parse - -from PyQt5 import QtCore, QtWidgets - -import modvault -import util - -FormClass, BaseClass = util.THEME.loadUiType("modvault/uimod.ui") - - -class UIModWidget(FormClass, BaseClass): - FORMATTER_UIMOD = str(util.THEME.readfile("modvault/uimod.qthtml")) - - def __init__(self, parent, *args, **kwargs): - BaseClass.__init__(self, *args, **kwargs) - - self.setupUi(self) - self.parent = parent - - self.setStyleSheet(self.parent.client.styleSheet()) - - self.setWindowTitle("Ui Mod Manager") - - self.doneButton.clicked.connect(self.doneClicked) - self.modList.itemEntered.connect(self.hoverOver) - allmods = modvault.getInstalledMods() - self.uimods = {} - for mod in allmods: - if mod.ui_only: - self.uimods[mod.totalname] = mod - self.modList.addItem(mod.totalname) - - names = [mod.totalname for mod in modvault.getActiveMods(uimods=True)] - for name in names: - l = self.modList.findItems(name, QtCore.Qt.MatchExactly) - if l: - l[0].setSelected(True) - - if len(self.uimods) != 0: - self.hoverOver(self.modList.item(0)) - - @QtCore.pyqtSlot() - def doneClicked(self): - selected_mods = [self.uimods[str(item.text())] for item in self.modList.selectedItems()] - succes = modvault.setActiveMods(selected_mods, False) - if not succes: - QtWidgets.QMessageBox.information(None, "Error", "Could not set the active UI mods. Maybe something is " - "wrong with your game.prefs file. Please send your log.") - self.done(1) - - @QtCore.pyqtSlot(QtWidgets.QListWidgetItem) - def hoverOver(self, item): - mod = self.uimods[str(item.text())] - self.modInfo.setText(self.FORMATTER_UIMOD.format(name=mod.totalname, description=mod.description)) diff --git a/src/modvault/uploadwidget.py b/src/modvault/uploadwidget.py deleted file mode 100644 index 4f9952901..000000000 --- a/src/modvault/uploadwidget.py +++ /dev/null @@ -1,116 +0,0 @@ -import urllib.request, urllib.error, urllib.parse -import tempfile -import zipfile -import os - -from PyQt5 import QtCore, QtWidgets - -import modvault -import util - -FormClass, BaseClass = util.THEME.loadUiType("modvault/upload.ui") - - -class UploadModWidget(FormClass, BaseClass): - def __init__(self, parent, modDir, modinfo, *args, **kwargs): - BaseClass.__init__(self, *args, **kwargs) - - self.setupUi(self) - self.parent = parent - self.client = self.parent.client - self.modinfo = modinfo - self.modDir = modDir - - self.setStyleSheet(self.parent.client.styleSheet()) - - self.setWindowTitle("Uploading Mod") - - self.Name.setText(modinfo.name) - self.Version.setText(str(modinfo.version)) - if modinfo.ui_only: - self.isUILabel.setText("is UI Only") - else: - self.isUILabel.setText("not UI Only") - self.UID.setText(modinfo.uid) - self.Description.setPlainText(modinfo.description) - if modinfo.icon != "": - self.IconURI.setText(modvault.iconPathToFull(modinfo.icon)) - self.updateThumbnail() - else: - self.Thumbnail.setPixmap(util.THEME.pixmap("games/unknown_map.png")) - self.UploadButton.pressed.connect(self.upload) - - @QtCore.pyqtSlot() - def upload(self): - n = self.Name.text() - if any([(i in n) for i in '"<*>|?/\\:']): - QtWidgets.QMessageBox.information(self.client, "Invalid Name", - "The mod name contains invalid characters: /\\<>|?:\"") - return - - iconpath = modvault.iconPathToFull(self.modinfo.icon) - infolder = False - if iconpath != "" and os.path.commonprefix([os.path.normcase(self.modDir), os.path.normcase(iconpath)]) == \ - os.path.normcase(self.modDir): # the icon is in the game folder - localpath = modvault.fullPathToIcon(iconpath) - infolder = True - if iconpath != "" and not infolder: - QtWidgets.QMessageBox.information(self.client, "Invalid Icon File", - "The file %s is not located inside the modfolder. Copy the icon file to " - "your modfolder and change the mod_info.lua accordingly" % iconpath) - return - - try: - temp = tempfile.NamedTemporaryFile(mode='w+b', suffix=".zip", delete=False) - zipped = zipfile.ZipFile(temp, "w", zipfile.ZIP_DEFLATED) - zipdir(self.modDir, zipped, os.path.basename(self.modDir)) - zipped.close() - temp.flush() - except: - QtWidgets.QMessageBox.critical(self.client, "Mod uploading error", "Something went wrong zipping the mod files.") - return - qfile = QtCore.QFile(temp.name) - - # The server should check again if there is already a mod with this name or UID. - self.client.lobby_connection.writeToServer("UPLOAD_MOD", "%s.v%04d.zip" % (self.modinfo.name, self.modinfo.version), self.modinfo.to_dict(), qfile) - - @QtCore.pyqtSlot() - def updateThumbnail(self): - iconfilename = modvault.iconPathToFull(self.modinfo.icon) - if iconfilename == "": - return False - if os.path.splitext(iconfilename)[1].lower() == ".dds": - old = iconfilename - iconfilename = os.path.join(self.modDir, os.path.splitext(os.path.basename(iconfilename))[0] + ".png") - succes = modvault.generateThumbnail(old, iconfilename) - if not succes: - QtWidgets.QMessageBox.information(self.client, "Invalid Icon File", - "Because FAF can't read DDS files, it tried to convert it to a png. " - "This failed. Try something else") - return False - try: - self.Thumbnail.setPixmap(util.THEME.pixmap(iconfilename, False)) - except: - QtWidgets.QMessageBox.information(self.client, "Invalid Icon File", - "This was not a valid icon file. Please pick a png or jpeg") - return False - self.modinfo.thumbnail = modvault.fullPathToIcon(iconfilename) - self.IconURI.setText(iconfilename) - return True - - -# from http://stackoverflow.com/questions/1855095/how-to-create-a-zip-archive-of-a-directory-in-python -def zipdir(path, zipf, fname): - # zips the entire directory path to zipf. Every file in the zipfile starts with fname. - # So if path is "/foo/bar/hello" and fname is "test" then every file in zipf is of the form "/test/*.*" - path = os.path.normcase(path) - if path[-1] in r'\/': - path = path[:-1] - short = os.path.split(path)[0] - for root, dirs, files in os.walk(path): - for f in files: - name = os.path.join(os.path.normcase(root), f) - n = name[len(os.path.commonprefix([name, path])):] - if n[0] == "\\": - n = n[1:] - zipf.write(name, os.path.join(fname, n)) diff --git a/src/news/__init__.py b/src/news/__init__.py index 97c382b5d..fbc0740e2 100644 --- a/src/news/__init__.py +++ b/src/news/__init__.py @@ -1,7 +1,11 @@ -from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply -from PyQt5 import QtWidgets, QtCore - from ._newswidget import NewsWidget from .newsitem import NewsItem from .newsmanager import NewsManager from .wpapi import WPAPI + +__all__ = ( + "NewsWidget", + "NewsItem", + "NewsManager", + "WPAPI", +) diff --git a/src/news/_newswidget.py b/src/news/_newswidget.py index c5a2642bc..d873952bf 100644 --- a/src/news/_newswidget.py +++ b/src/news/_newswidget.py @@ -1,86 +1,160 @@ -from PyQt5 import QtCore, QtWidgets -from PyQt5.QtCore import Qt - -import webbrowser -import util -import re -from .newsitem import NewsItem, NewsItemDelegate -from .newsmanager import NewsManager - -from util.qt import ExternalLinkPage - -import base64 - import logging +import os.path -logger = logging.getLogger(__name__) - - -class Hider(QtCore.QObject): - """ - Hides a widget by blocking its paint event. This is useful if a - widget is in a layout that you do not want to change when the - widget is hidden. - """ - def __init__(self, parent=None): - super(Hider, self).__init__(parent) +from PyQt6 import QtWidgets +from PyQt6.QtCore import QPoint +from PyQt6.QtCore import QSize +from PyQt6.QtCore import QUrl +from PyQt6.QtGui import QImage +from PyQt6.QtGui import QTextDocument +from PyQt6.QtNetwork import QNetworkAccessManager - def eventFilter(self, obj, ev): - return ev.type() == QtCore.QEvent.Paint +import util +from config import Settings +from downloadManager import Downloader +from downloadManager import DownloadRequest - def hide(self, widget): - widget.installEventFilter(self) - widget.update() +from .newsitem import NewsItem +from .newsitem import NewsItemDelegate +from .newsmanager import NewsManager - def unhide(self, widget): - widget.removeEventFilter(self) - widget.update() +logger = logging.getLogger(__name__) - def hideWidget(self, sender): - if sender.isWidgetType(): - self.hide(sender) FormClass, BaseClass = util.THEME.loadUiType("news/news.ui") class NewsWidget(FormClass, BaseClass): - CSS = util.THEME.readstylesheet('news/news_webview.css') + CSS = util.THEME.readstylesheet('news/news_style.css') - HTML = str(util.THEME.readfile('news/news_webview_frame.html')) + HTML = util.THEME.readfile('news/news_page.html') - def __init__(self, *args, **kwargs): + def __init__(self, *args, **kwargs) -> None: BaseClass.__init__(self, *args, **kwargs) self.setupUi(self) + self.nam = QNetworkAccessManager() + self._downloader = Downloader(util.NEWS_CACHE_DIR) + self._images_dl_request = DownloadRequest() + self._images_dl_request.done.connect(self.item_image_downloaded) + self.newsManager = NewsManager(self) + self.newsItems = [] # open all links in external browser - self.newsWebView.setPage(ExternalLinkPage(self)) + self.newsTextBrowser.setOpenExternalLinks(True) - # hide webview until loaded to avoid FOUC - self.hider = Hider() - self.hider.hide(self.newsWebView) - self.newsWebView.loadFinished.connect(self.loadFinished) + self.settingsFrame.hide() + self.hideNewsEdit.setText(Settings.get('news/hideWords', "")) - self.newsList.setIconSize(QtCore.QSize(0, 0)) + self.newsList.setIconSize(QSize(0, 0)) self.newsList.setItemDelegate(NewsItemDelegate(self)) self.newsList.currentItemChanged.connect(self.itemChanged) + self.newsSettings.pressed.connect(self.showSettings) + self.showAllButton.pressed.connect(self.showAll) + self.hideNewsEdit.textEdited.connect(self.updateNewsFilter) + self.hideNewsEdit.cursorPositionChanged.connect(self.showEditToolTip) def addNews(self, newsPost): newsItem = NewsItem(newsPost, self.newsList) - - # QtWebEngine has no user CSS support yet, so let's just prepend it to the HTML - def _injectCSS(self, body): - return ''.format(self.CSS) + body - - def itemChanged(self, current, previous): - self.newsWebView.page().setHtml(self.HTML.format(title=current.newsPost['title'], - content=self._injectCSS(current.newsPost['body']),)) - - def linkClicked(self, url): - webbrowser.open(url.toString()) - - def loadFinished(self, ok): - self.hider.unhide(self.newsWebView) - self.newsWebView.loadFinished.disconnect(self.loadFinished) + self.newsItems.append(newsItem) + + def download_image(self, img_url: str) -> None: + name = os.path.basename(img_url) + self._downloader.download(name, self._images_dl_request, img_url) + + def add_image_resource(self, image_name: str, image_path: str) -> None: + doc = self.newsTextBrowser.document() + if doc.resource(QTextDocument.ResourceType.ImageResource, QUrl(image_name)): + return + img = QImage(image_path) + scaled = img.scaled(QSize(900, 500)) + doc.addResource(QTextDocument.ResourceType.ImageResource, QUrl(image_name), scaled) + + def item_image_downloaded(self, image_name: str, result: tuple[str, bool]) -> None: + image_path, download_failed = result + if not download_failed: + self.add_image_resource(image_name, image_path) + self.show_newspage() + + def itemChanged(self, current: NewsItem | None, previous: NewsItem | None) -> None: + if current is None: + return + + url = current.newsPost["img_url"] + image_name = os.path.basename(url) + image_path = os.path.join(util.NEWS_CACHE_DIR, image_name) + if os.path.isfile(image_path): + self.add_image_resource(image_name, image_path) + self.show_newspage() + else: + self._downloader.download(image_name, self._images_dl_request, url) + + def show_newspage(self) -> None: + current = self.newsList.currentItem() + + if current.newsPost['external_link'] == '': + external_link = current.newsPost['link'] + else: + external_link = current.newsPost['external_link'] + + image_name = os.path.basename(current.newsPost["img_url"]) + content = current.newsPost["excerpt"].strip().removeprefix("").removesuffix("
") + html = self.HTML.format( + style=self.CSS, + title=current.newsPost['title'], + content=content, + img_source=image_name, + external_link=external_link, + ) + self.newsTextBrowser.setHtml(html) + + def showAll(self): + for item in self.newsItems: + item.setHidden(False) + self.updateLabel(0) + + def showEditToolTip(self) -> None: + """ + Default tooltips are too slow and disappear when user starts typing + """ + widget = self.hideNewsEdit + position = widget.mapToGlobal( + QPoint(0 + widget.width(), 0 - widget.height() / 2), + ) + QtWidgets.QToolTip.showText( + position, + "To separate multiple words use commas: nomads,server,dev", + ) + + def showSettings(self): + if self.settingsFrame.isHidden(): + self.settingsFrame.show() + else: + self.settingsFrame.hide() + + def updateNewsFilter(self, text=False): + if text is not False: + Settings.set('news/hideWords', text) + + filterList = Settings.get('news/hideWords', "").lower().split(",") + newsHidden = 0 + + if filterList[0]: + for item in self.newsItems: + for word in filterList: + if word in item.text().lower(): + item.setHidden(True) + newsHidden += 1 + break + else: + item.setHidden(False) + else: + for item in self.newsItems: + item.setHidden(False) + + self.updateLabel(newsHidden) + + def updateLabel(self, number): + self.totalHidden.setText("NEWS HIDDEN: " + str(number)) diff --git a/src/news/newsitem.py b/src/news/newsitem.py index 81ac4daa1..b3c27e240 100644 --- a/src/news/newsitem.py +++ b/src/news/newsitem.py @@ -1,19 +1,21 @@ -from PyQt5 import QtCore, QtGui, QtWidgets +import logging + +from PyQt6 import QtCore +from PyQt6 import QtGui +from PyQt6 import QtWidgets import util -import client -import logging logger = logging.getLogger(__name__) class NewsItemDelegate(QtWidgets.QStyledItemDelegate): - def __init__(self, *args, **kwargs): + def __init__(self, *args, **kwargs) -> None: QtWidgets.QStyledItemDelegate.__init__(self, *args, **kwargs) html = QtGui.QTextDocument() to = QtGui.QTextOption() - to.setWrapMode(QtGui.QTextOption.WordWrap) + to.setWrapMode(QtGui.QTextOption.WrapMode.WordWrap) html.setDefaultTextOption(to) html.setTextWidth(NewsItem.TEXTWIDTH) @@ -26,30 +28,40 @@ def paint(self, painter, option, index, *args, **kwargs): self.html.setHtml(option.text) - icon = QtGui.QIcon(option.icon) - - # clear icon and text before letting the control draw itself because we're rendering these parts ourselves + # clear icon and text before letting the control draw itself because + # we're rendering these parts ourselves option.icon = QtGui.QIcon() - option.text = "" - option.widget.style().drawControl(QtWidgets.QStyle.CE_ItemViewItem, option, painter, option.widget) + option.text = "" + option.widget.style().drawControl( + QtWidgets.QStyle.ControlElement.CE_ItemViewItem, option, painter, option.widget, + ) # Shadow (100x100 shifted 8 right and 8 down) -# painter.fillRect(option.rect.left()+8, option.rect.top()+8, 100, 100, QtGui.QColor("#202020")) + # painter.fillRect(option.rect.left()+8, option.rect.top()+8, + # 100, 100, QtGui.QColor("#202020")) -# # Icon (110x110 adjusted: shifts top,left 3 and bottom,right -7 -> makes/clips it to 100x100) -# icon.paint(painter, option.rect.adjusted(3, 3, -7, -7), QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + # Icon (110x110 adjusted: shifts top,left 3 and bottom,right -7 -> + # makes/clips it to 100x100) + # icon.paint(painter, option.rect.adjusted(3, 3, -7, -7), + # QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) # Frame around the icon (100x100 shifted 3 right and 3 down) -# pen = QtWidgets.QPen() -# pen.setWidth(1) -# pen.setBrush(QtGui.QColor("#303030")) # FIXME: This needs to come from theme. -# pen.setCapStyle(QtCore.Qt.RoundCap) -# painter.setPen(pen) -# painter.drawRect(option.rect.left() + 3, option.rect.top() + 3, 100, 100) - - # Description (text right of map icon(100), shifted 10 more right and 10 down) - painter.translate(option.rect.left() + 10, option.rect.top()+10) - clip = QtCore.QRectF(0, 0, option.rect.width() - 10 - 5, option.rect.height()) + # pen = QtWidgets.QPen() + # pen.setWidth(1) + # FIXME: This needs to come from theme. + # pen.setBrush(QtGui.QColor("#303030")) + + # pen.setCapStyle(QtCore.Qt.RoundCap) + # painter.setPen(pen) + # painter.drawRect(option.rect.left() + 3, option.rect.top() + 3, + # 100, 100) + + # Description (text right of map icon(100), shifted 10 more right and + # 10 down) + painter.translate(option.rect.left() + 10, option.rect.top() + 10) + clip = QtCore.QRectF( + 0, 0, option.rect.width() - 10 - 5, option.rect.height(), + ) self.html.drawContents(painter, clip) painter.restore() @@ -59,7 +71,9 @@ def sizeHint(self, option, index, *args, **kwargs): self.html.setHtml(option.text) - return QtCore.QSize(NewsItem.TEXTWIDTH + NewsItem.PADDING, NewsItem.TEXTHEIGHT) + return QtCore.QSize( + NewsItem.TEXTWIDTH + NewsItem.PADDING, NewsItem.TEXTHEIGHT, + ) class NewsItem(QtWidgets.QListWidgetItem): @@ -74,11 +88,13 @@ def __init__(self, newsPost, *args, **kwargs): self.newsPost = newsPost - self.setText(self.FORMATTER.format( - author=newsPost['author'][0]['name'], - date=newsPost['date'], - title=newsPost['title'] - )) + self.setText( + self.FORMATTER.format( + author=newsPost['author'][0]['name'], + date=newsPost['date'], + title=newsPost['title'], + ), + ) def __ge__(self, other): """ Comparison operator used for item list sorting """ diff --git a/src/news/newsmanager.py b/src/news/newsmanager.py index 23a87fa4b..b2707933d 100644 --- a/src/news/newsmanager.py +++ b/src/news/newsmanager.py @@ -1,13 +1,13 @@ -from PyQt5 import QtCore -from PyQt5.QtCore import QObject, Qt +import logging -from .newsitem import NewsItem -from .wpapi import WPAPI +from PyQt6 import QtCore +from PyQt6.QtCore import QObject +from PyQt6.QtCore import Qt import client -import math -import logging +from .wpapi import WPAPI + logger = logging.getLogger(__name__) @@ -17,20 +17,20 @@ class NewsManager(QObject): def __init__(self, client): QObject.__init__(self) self.widget = client -# self.newsContent = [] -# self.newsFrames = [] -# self.selectedFrame = None -# self.page = 0 -# -# for i in range(self.FRAMES): -# frame = NewsFrame() -# self.newsFrames.append(frame) -# client.newsAreaLayout.addWidget(frame) -# frame.clicked.connect(self.frameClicked) -# -# client.nextPageButton.clicked.connect(self.nextPage) -# client.prevPageButton.clicked.connect(self.prevPage) -# client.pageBox.currentIndexChanged.connect(self.selectPage) + # self.newsContent = [] + # self.newsFrames = [] + # self.selectedFrame = None + # self.page = 0 + + # for i in range(self.FRAMES): + # frame = NewsFrame() + # self.newsFrames.append(frame) + # client.newsAreaLayout.addWidget(frame) + # frame.clicked.connect(self.frameClicked) + + # client.nextPageButton.clicked.connect(self.nextPage) + # client.prevPageButton.clicked.connect(self.prevPage) + # client.pageBox.currentIndexChanged.connect(self.selectPage) self.WpApi = WPAPI(client) self.WpApi.newsDone.connect(self.on_wpapi_done) @@ -39,7 +39,8 @@ def __init__(self, client): @QtCore.pyqtSlot(list) def on_wpapi_done(self, items): """ - Reinitialize the whole news conglomerate after downloading the news from the api. + Reinitialize the whole news conglomerate after downloading the news + from the api. items is a list of (title, content) tuples. @@ -47,17 +48,30 @@ def on_wpapi_done(self, items): """ for item in items: self.widget.addNews(item) - self.widget.newsList.setCurrentItem(self.widget.newsList.item(0)) -# self.newsContent = self.newsContent + items -# -# self.npages = int(math.ceil(len(self.newsContent) / self.FRAMES)) -# -## origpage = self.page -# -# pb = client.instance.pageBox -# pb.insertItems(pb.count(), ['Page {: >2}'.format(x + 1) for x in range(pb.count(), self.npages)]) -# -# self.selectPage(self.page) + + self.widget.updateNewsFilter() + for i in range(0, 10): + if not self.widget.newsList.item(i).isHidden(): + self.widget.newsList.setCurrentItem( + self.widget.newsList.item(i), + ) + break + # self.newsContent = self.newsContent + items + + # self.npages = int(math.ceil(len(self.newsContent) / self.FRAMES)) + + # origpage = self.page + + # pb = client.instance.pageBox + # pb.insertItems( + # pb.count(), + # [ + # 'Page {: >2}'.format(x + 1) + # for x in range(pb.count(), self.npages) + # ], + # ) + + # self.selectPage(self.page) @QtCore.pyqtSlot() def frameClicked(self): @@ -80,7 +94,7 @@ def expandFrame(self, selectedFrame): for frame in self.newsFrames: frame.collapse() - selectedFrame.expand(Qt.ScrollBarAsNeeded, set_filter=False) + selectedFrame.expand(Qt.ScrollBarPolicy.ScrollBarAsNeeded, set_filter=False) self.selectedFrame = selectedFrame @@ -88,7 +102,7 @@ def resetFrames(self): logger.info('resetFrames') self.selectedFrame = None for frame in self.newsFrames: - frame.expand(Qt.ScrollBarAlwaysOff, set_filter=True) + frame.expand(Qt.ScrollBarPolicy.ScrollBarAlwaysOff, set_filter=True) def nextPage(self): pb = client.instance.pageBox @@ -111,7 +125,7 @@ def selectPage(self, idx): elif idx == self.npages - 1: client.instance.nextPageButton.setEnabled(False) # download next page - self.WpApi.download(page=self.npages+1, perpage=self.FRAMES) + self.WpApi.download(page=self.npages + 1, perpage=self.FRAMES) firstNewsIdx = idx * self.FRAMES diff --git a/src/news/wpapi.py b/src/news/wpapi.py index 82c703eaa..15a6ad780 100644 --- a/src/news/wpapi.py +++ b/src/news/wpapi.py @@ -1,14 +1,19 @@ -from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply -from PyQt5 import QtCore - import json import logging -import sys + +from PyQt6 import QtCore +from PyQt6.QtNetwork import QNetworkAccessManager +from PyQt6.QtNetwork import QNetworkReply +from PyQt6.QtNetwork import QNetworkRequest + +from config import Settings logger = logging.getLogger(__name__) # FIXME: Make setting -WPAPI_ROOT = 'http://direct.faforever.com/wp-json/wp/v2/posts?per_page={perpage}&page={page}&_embed=1' +WPAPI_ROOT = ( + '{host}/wp-json/wp/v2/posts?per_page={perpage}&page={page}&_embed=1' +) class WPAPI(QtCore.QObject): @@ -41,15 +46,26 @@ def finishedDownload(self, reply): 'body': post.get('content', {}).get('rendered'), 'date': post.get('date'), 'excerpt': post.get('excerpt', {}).get('rendered'), - 'author': post.get('_embedded', {}).get('author') + 'author': post.get('_embedded', {}).get('author'), + 'link': post.get('link'), + 'external_link': post.get('newshub_externalLinkUrl'), + 'img_url': ( + post.get('_embedded', {}) + .get('wp:featuredmedia', [{}])[0] + .get('source_url', "") + ), } posts.append(content) self.newsDone.emit(posts) - except: + except BaseException: logger.exception('Error handling wp data') def download(self, page=1, perpage=10): - url = QtCore.QUrl(WPAPI_ROOT.format(page=page, perpage=perpage)) + url = QtCore.QUrl( + WPAPI_ROOT.format( + host=Settings.get('news/host'), page=page, perpage=perpage, + ), + ) request = QNetworkRequest(url) self.nam.get(request) diff --git a/src/notifications/__init__.py b/src/notifications/__init__.py index 13c072d76..f5a4b74db 100644 --- a/src/notifications/__init__.py +++ b/src/notifications/__init__.py @@ -1,20 +1,23 @@ -from PyQt5 import QtCore - -import util -from fa import maps -from notifications.ns_dialog import NotificationDialog -from notifications.ns_settings import NsSettingsDialog, IngameNotification - """ The Notification Systems reacts on events and displays a popup. Each event_type has a NsHook to customize it. """ +from PyQt6 import QtCore + +import util +from config import Settings +from fa import maps +from notifications.ns_dialog import NotificationDialog +from notifications.ns_settings import IngameNotification +from notifications.ns_settings import NsSettingsDialog class Notifications: USER_ONLINE = 'user_online' NEW_GAME = 'new_game' GAME_FULL = 'game_full' + UNOFFICIAL_CLIENT = 'unofficial_client' + PARTY_INVITE = 'party_invite' def __init__(self, client, gameset, playerset, me): self.client = client @@ -25,24 +28,35 @@ def __init__(self, client, gameset, playerset, me): self.events = [] self.disabledStartup = True self.game_running = False + self.unofficialClientDate = Settings.get( + 'notifications/unofficialClientDate', 0, type=int, + ) - client.gameEnter.connect(self.gameEnter) - client.gameExit.connect(self.gameExit) - client.gameFull.connect(self._gamefull) + client.game_enter.connect(self.gameEnter) + client.game_exit.connect(self.gameExit) + client.game_full.connect(self._gamefull) + client.unofficial_client.connect(self.unofficialClient) + client.party_invite.connect(self.partyInvite) gameset.newLobby.connect(self._newLobby) - playerset.playerAdded.connect(self._newPlayer) + playerset.added.connect(self._newPlayer) self.user = util.THEME.icon("client/user.png", pix=True) def _newPlayer(self, player): - if self.isDisabled() or not self.settings.popupEnabled(self.USER_ONLINE): + if ( + self.isDisabled() + or not self.settings.popupEnabled(self.USER_ONLINE) + ): return if self.me.player is not None and self.me.player == player: return notify_mode = self.settings.getCustomSetting(self.USER_ONLINE, 'mode') - if notify_mode != 'all' and not self.me.isFriend(player.id): + if ( + notify_mode != 'all' + and not self.me.relations.model.is_friend(player.id) + ): return self.events.append((self.USER_ONLINE, player.copy())) @@ -55,7 +69,7 @@ def _newLobby(self, game): host = game.host_player notify_mode = self.settings.getCustomSetting(self.NEW_GAME, 'mode') if notify_mode != 'all': - if host is None or not self.me.isFriend(host): + if host is None or not self.me.relations.model.is_friend(host): return self.events.append((self.NEW_GAME, game.copy())) @@ -64,7 +78,30 @@ def _newLobby(self, game): def _gamefull(self): if self.isDisabled() or not self.settings.popupEnabled(self.GAME_FULL): return - self.events.append((self.GAME_FULL, None)) + if (self.GAME_FULL, None) not in self.events: + self.events.append((self.GAME_FULL, None)) + self.checkEvent() + + def unofficialClient(self, msg): + date = QtCore.QDate.currentDate().dayOfYear() + if date == self.unofficialClientDate: # Show once per day + return + + self.unofficialClientDate = date + Settings.set( + 'notifications/unofficialClientDate', self.unofficialClientDate, + ) + self.events.append((self.UNOFFICIAL_CLIENT, msg)) + self.checkEvent() + + def partyInvite(self, message): + notify_mode = self.settings.getCustomSetting(self.PARTY_INVITE, 'mode') + if ( + notify_mode != 'all' + and not self.me.relations.model.is_friend(message["sender"]) + ): + return + self.events.append((self.PARTY_INVITE, message)) self.checkEvent() def gameEnter(self): @@ -79,7 +116,13 @@ def gameExit(self): def isDisabled(self): return ( self.disabledStartup - or self.game_running and self.settings.ingame_notifications == IngameNotification.DISABLE + or ( + self.game_running + and ( + self.settings.ingame_notifications + == IngameNotification.DISABLE + ) + ) or not self.settings.enabled ) @@ -89,7 +132,9 @@ def setNotificationEnabled(self, enabled): @QtCore.pyqtSlot() def on_showSettings(self): - """ Shows a Settings Dialg with all registered notifications modules """ + """ + Shows a Settings Dialg with all registered notifications modules + """ self.settings.show() def showEvent(self): @@ -97,7 +142,8 @@ def showEvent(self): Display the next event in the queue as popup Pops event from queue and checks if it is showable as per settings - If event is showable, process event data and then feed it into notification dialog + If event is showable, process event data and then feed it into + notification dialog Returns True if showable event found, False otherwise """ @@ -111,8 +157,10 @@ def showEvent(self): if eventType == self.USER_ONLINE: player = data pixmap = self.user - text = '%s| {title} |
| {title} |
| VS | " + teams += ( + "" + "VS | " + ) - if len(self.teams) == 2: # prepare the package to 'fit in' with itss - teams = " |
| s + if len(self.teams) == 2: + teams = " |
![](\"map.png\")
{}
'.format(trimmed_description)) + + def __ge__(self, other: VaultListItem) -> bool: + return not self.__lt__(self, other) + + def __lt__(self, other: VaultListItem) -> bool: + if self.parent.sortType == "alphabetical": + return self._lt_alphabetical(other) + elif self.parent.sortType == "rating": + return self._lt_rating(other) + elif self.parent.sortType == "date": + return self._lt_date(other) + return True + + def _lt_date(self, other: VaultListItem) -> bool: + if self.item_version.create_time == other.item_version.create_time: + if self.item_version.update_time == other.item_version.update_time: + return self._lt_alphabetical(other) + return self.item_version.update_time < other.item_version.update_time + return self.item_version.create_time < other.item_version.create_time + + def _lt_alphabetical(self, other: VaultListItem) -> bool: + return self.item_info.display_name.lower() > other.item_info.display_name.lower() + + def _lt_rating(self, other: VaultListItem) -> bool: + review = self.item_info.reviews_summary + other_review = other.item_info.reviews_summary + + if review is None: + return other_review is not None + if other_review is None: + return review is None + + if review.average_score == other_review.average_score: + if review.num_reviews == other_review.num_reviews: + return self._lt_alphabetical(other) + return review.num_reviews < other_review.num_reviews + + return review.average_score < other_review.average_score + + +class VaultItemDelegate(QStyledItemDelegate): + def paint(self, painter, option, index, *args, **kwargs): + self.initStyleOption(option, index) + + painter.save() + + html = QtGui.QTextDocument() + html.setHtml(option.text) + + icon = QtGui.QIcon(option.icon) + iconsize = QtCore.QSize(VaultListItem.ICONSIZE, VaultListItem.ICONSIZE) + + # clear icon and text before letting the control draw itself because + # we're rendering these parts ourselves + option.icon = QtGui.QIcon() + option.text = "" + control_element = QStyle.ControlElement.CE_ItemViewItem + option.widget.style().drawControl(control_element, option, painter, option.widget) + + # Shadow + painter.fillRect( + option.rect.left() + 7, + option.rect.top() + 7, + iconsize.width(), + iconsize.height(), + QtGui.QColor("#202020"), + ) + + iconrect = QtCore.QRect(option.rect.adjusted(3, 3, 0, 0)) + iconrect.setSize(iconsize) + # Icon + alignment = QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignVCenter + icon.paint(painter, iconrect, alignment) + + # Frame around the icon + pen = QtGui.QPen() + pen.setWidth(1) + # FIXME: This needs to come from theme. + pen.setBrush(QtGui.QColor("#303030")) + + pen.setCapStyle(QtCore.Qt.PenCapStyle.RoundCap) + painter.setPen(pen) + painter.drawRect(iconrect) + + # Description + painter.translate( + option.rect.left() + iconsize.width() + 10, option.rect.top() + 4, + ) + clip = QtCore.QRectF( + 0, 0, option.rect.width() - iconsize.width() - 15, + option.rect.height(), + ) + html.drawContents(painter, clip) + + painter.restore() + + def sizeHint(self, option, index, *args, **kwargs): + self.initStyleOption(option, index) + + html = QtGui.QTextDocument() + html.setHtml(option.text) + html.setTextWidth(VaultListItem.TEXTWIDTH) + return QtCore.QSize( + ( + VaultListItem.ICONSIZE + + VaultListItem.TEXTWIDTH + + VaultListItem.PADDING + ), + VaultListItem.ICONSIZE + VaultListItem.PADDING, + ) diff --git a/tests/conftest.py b/tests/conftest.py index d1fb13e25..335177a67 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,6 +6,12 @@ from model.playerset import Playerset +@pytest.fixture +def client_instance(): + from client import instance + return instance + + @pytest.fixture def player(mocker): return mocker.MagicMock(spec=Player) @@ -24,3 +30,9 @@ def playerset(mocker): @pytest.fixture def gameset(mocker): return mocker.MagicMock(spec=Gameset) + + +@pytest.fixture +def mouse_position(client_instance): + from client.mouse_position import MousePosition + return MousePosition(client_instance) diff --git a/tests/fa/test_featured.py b/tests/fa/test_featured.py deleted file mode 100644 index 4c9449411..000000000 --- a/tests/fa/test_featured.py +++ /dev/null @@ -1,92 +0,0 @@ -__author__ = 'Thygrrr' - -from fa import updater -from PyQt5 import QtWidgets, QtCore -import pytest -import collections - -class _TestObjectWithoutIsFinished(QtCore.QObject): - finished = QtCore.pyqtSignal() - - -class _TestThreadNoOp(QtCore.QThread): - def run(self): - self.yieldCurrentThread() - - -def test_updater_is_a_dialog(application): - assert isinstance(updater.UpdaterProgressDialog(None), QtWidgets.QDialog) - - -def test_updater_has_progress_bar_game_progress(application): - assert isinstance(updater.UpdaterProgressDialog(None).gameProgress, QtWidgets.QProgressBar) - - -def test_updater_has_progress_bar_map_progress(application): - assert isinstance(updater.UpdaterProgressDialog(None).mapProgress, QtWidgets.QProgressBar) - - -def test_updater_has_progress_bar_mod_progress(application): - assert isinstance(updater.UpdaterProgressDialog(None).mapProgress, QtWidgets.QProgressBar) - - -def test_updater_has_method_append_log(application): - assert isinstance(updater.UpdaterProgressDialog(None).appendLog, collections.Callable) - - -def test_updater_append_log_accepts_string(application): - updater.UpdaterProgressDialog(None).appendLog("Hello Test") - - -def test_updater_has_method_add_watch(application): - assert isinstance(updater.UpdaterProgressDialog(None).addWatch, collections.Callable) - - -def test_updater_append_log_accepts_qobject_with_signals_finished(application): - updater.UpdaterProgressDialog(None).addWatch(QtCore.QThread()) - - -def test_updater_add_watch_raises_error_on_watch_without_signal_finished(application): - with pytest.raises(AttributeError): - updater.UpdaterProgressDialog(None).addWatch(QtCore.QObject()) - - -def test_updater_watch_finished_raises_error_on_watch_without_method_is_finished(application): - u = updater.UpdaterProgressDialog(None) - u.addWatch(_TestObjectWithoutIsFinished()) - with pytest.raises(AttributeError): - u.watchFinished() - - -def test_updater_hides_and_accepts_if_all_watches_are_finished(application): - u = updater.UpdaterProgressDialog(None) - t = _TestThreadNoOp() - - u.addWatch(t) - u.show() - t.start() - - while not t.isFinished(): - pass - - application.processEvents() - assert not u.isVisible() - assert u.result() == QtWidgets.QDialog.Accepted - - -def test_updater_does_not_hide_and_accept_before_all_watches_are_finished(application): - u = updater.UpdaterProgressDialog(None) - t = _TestThreadNoOp() - t_not_finished = QtCore.QThread() - - u.addWatch(t) - u.addWatch(t_not_finished) - u.show() - t.start() - - while not t.isFinished(): - pass - - application.processEvents() - assert u.isVisible() - assert not u.result() == QtWidgets.QDialog.Accepted diff --git a/tests/fa/test_updater.py b/tests/fa/test_updater.py index 53b5f3521..0e9b0757e 100644 --- a/tests/fa/test_updater.py +++ b/tests/fa/test_updater.py @@ -1,9 +1,13 @@ __author__ = 'Thygrrr' -from fa import updater -from PyQt5 import QtWidgets, QtCore +from typing import Callable + import pytest -import collections +from PyQt6 import QtCore +from PyQt6 import QtWidgets + +from fa.game_updater.updater import UpdaterProgressDialog + class NoIsFinished(QtCore.QObject): finished = QtCore.pyqtSignal() @@ -15,54 +19,66 @@ def run(self): def test_updater_is_a_dialog(application): - assert isinstance(updater.UpdaterProgressDialog(None), QtWidgets.QDialog) + assert isinstance(UpdaterProgressDialog(None), QtWidgets.QDialog) def test_updater_has_progress_bar_game_progress(application): - assert isinstance(updater.UpdaterProgressDialog(None).gameProgress, QtWidgets.QProgressBar) - - -def test_updater_has_progress_bar_map_progress(application): - assert isinstance(updater.UpdaterProgressDialog(None).mapProgress, QtWidgets.QProgressBar) + assert isinstance( + UpdaterProgressDialog(None).gameProgress, + QtWidgets.QProgressBar, + ) def test_updater_has_progress_bar_mod_progress(application): - assert isinstance(updater.UpdaterProgressDialog(None).mapProgress, QtWidgets.QProgressBar) + assert isinstance( + UpdaterProgressDialog(None).modProgress, + QtWidgets.QProgressBar, + ) def test_updater_has_method_append_log(application): - assert isinstance(updater.UpdaterProgressDialog(None).appendLog, collections.Callable) + assert isinstance( + UpdaterProgressDialog(None).append_log, + Callable, + ) def test_updater_append_log_accepts_string(application): - updater.UpdaterProgressDialog(None).appendLog("Hello Test") + UpdaterProgressDialog(None).append_log("Hello Test") def test_updater_has_method_add_watch(application): - assert isinstance(updater.UpdaterProgressDialog(None).addWatch, collections.Callable) + assert isinstance( + UpdaterProgressDialog(None).add_watch, + Callable, + ) def test_updater_append_log_accepts_qobject_with_signals_finished(application): - updater.UpdaterProgressDialog(None).addWatch(QtCore.QThread()) + UpdaterProgressDialog(None).add_watch(QtCore.QThread()) -def test_updater_add_watch_raises_error_on_watch_without_signal_finished(application): +def test_updater_add_watch_raises_error_on_watch_without_signal_finished( + application, +): with pytest.raises(AttributeError): - updater.UpdaterProgressDialog(None).addWatch(QtCore.QObject()) + UpdaterProgressDialog(None).add_watch(QtCore.QObject()) -def test_updater_watch_finished_raises_error_on_watch_without_method_is_finished(application): - u = updater.UpdaterProgressDialog(None) - u.addWatch(NoIsFinished()) +def test_updater_watch_finished_raises_error_on_watch_without_method_finished( + application, +): + u = UpdaterProgressDialog(None) + u.add_watch(NoIsFinished()) with pytest.raises(AttributeError): u.watchFinished() def test_updater_hides_and_accepts_if_all_watches_are_finished(application): - u = updater.UpdaterProgressDialog(None) + u = UpdaterProgressDialog(None) t = NoOpThread() - u.addWatch(t) + u.add_watch(t) u.show() t.start() @@ -71,16 +87,18 @@ def test_updater_hides_and_accepts_if_all_watches_are_finished(application): application.processEvents() assert not u.isVisible() - assert u.result() == QtWidgets.QDialog.Accepted + assert u.result() == QtWidgets.QDialog.DialogCode.Accepted -def test_updater_does_not_hide_and_accept_before_all_watches_are_finished(application): - u = updater.UpdaterProgressDialog(None) +def test_updater_does_not_hide_and_accept_before_all_watches_are_finished( + application, +): + u = UpdaterProgressDialog(None) t = NoOpThread() t_not_finished = QtCore.QThread() - u.addWatch(t) - u.addWatch(t_not_finished) + u.add_watch(t) + u.add_watch(t_not_finished) u.show() t.start() @@ -89,5 +107,4 @@ def test_updater_does_not_hide_and_accept_before_all_watches_are_finished(applic application.processEvents() assert u.isVisible() - assert not u.result() == QtWidgets.QDialog.Accepted - + assert not u.result() == QtWidgets.QDialog.DialogCode.Accepted diff --git a/tests/integration_tests/model/test_player_game.py b/tests/integration_tests/model/test_player_game.py index 2f52508a8..2f1206ac8 100644 --- a/tests/integration_tests/model/test_player_game.py +++ b/tests/integration_tests/model/test_player_game.py @@ -1,26 +1,25 @@ import copy from model.game import Game, GameState, GameVisibility -from model.gameset import Gameset -from model.playerset import Playerset +from model.gameset import Gameset, PlayerGameIndex from model.player import Player +from model.playerset import Playerset GAME_DICT = { - "uid": 1, + "uid": 1, "state": GameState.OPEN, "launched_at": 10000, "num_players": 3, "max_players": 8, "title": "Sentons sucks", - "host": "Guy", + "host": "Guy", "mapname": "Sentons Ultimate 6v6", "map_file_path": "xrca_co_000001.scfamap", "teams": { 1: ["Guy", "TableNoob"], - 2: ["Kraut"] - }, + 2: ["Kraut"], + }, "featured_mod": "faf", - "featured_mod_versions": {}, "sim_mods": {}, "password_protected": False, "visibility": GameVisibility.PUBLIC, @@ -35,7 +34,7 @@ def check_relation(game, player, exists): def setup(): ps = Playerset() gs = Gameset(ps) - + pgr = PlayerGameIndex(gs, ps) p = Player(**{"id_": 1, "login": "Guy"}) ps[p.id] = p p = Player(**{"id_": 2, "login": "TableNoob"}) @@ -45,11 +44,11 @@ def setup(): g = Game(playerset=ps, **GAME_DICT) gs[g.uid] = g - return ps, gs + return ps, gs, pgr def test_setup(): - ps, gs = setup() + ps, gs, pgr = setup() for i in range(1, 3): assert ps[i].currentGame is gs[1] @@ -67,6 +66,7 @@ def test_setup(): def test_player_at_game_change(mocker): ps = Playerset() gs = Gameset(ps) + pgr = PlayerGameIndex(gs, ps) # noqa: F841 p = Player(**{"id_": 1, "login": "Guy"}) ps[p.id] = p @@ -96,7 +96,7 @@ def test_player_at_game_change(mocker): def test_player_at_another_game(mocker): - ps, gs = setup() + ps, gs, pgr = setup() data = copy.deepcopy(GAME_DICT) @@ -126,6 +126,7 @@ def test_player_at_another_game(mocker): def test_game_at_missing_player(mocker): ps = Playerset() gs = Gameset(ps) + pgr = PlayerGameIndex(gs, ps) # noqa: F841 p = Player(**{"id_": 1, "login": "Guy"}) ps[p.id] = p @@ -134,8 +135,6 @@ def test_game_at_missing_player(mocker): data = copy.deepcopy(GAME_DICT) g1 = Game(playerset=ps, **data) - pAdd = mocker.Mock() - g1.connectedPlayerAdded.connect(pAdd) gs[1] = g1 assert len(g1.players) == 3 @@ -144,10 +143,8 @@ def test_game_at_missing_player(mocker): assert ps[1] in gps assert ps[2] in gps - assert not pAdd.called p = Player(**{"id_": 3, "login": "Kraut"}) ps[p.id] = p - pAdd.assert_called_with(g1, ps[3]) gps = [g1.to_player(n) for n in g1.players if g1.is_connected(n)] assert len(gps) == 3 @@ -157,29 +154,16 @@ def test_game_at_missing_player(mocker): def test_remove_add_player(mocker): - ps, gs = setup() - - pAdd = mocker.Mock() - gs[1].connectedPlayerAdded.connect(pAdd) - pRem = mocker.Mock() - gs[1].connectedPlayerRemoved.connect(pRem) - + ps, gs, pgr = setup() p3 = ps[3] del ps[3] - pRem.assert_called_with(gs[1], p3) - assert not pAdd.called assert not gs[1].is_connected(p3.login) - - pRem.reset_mock() - ps[3] = p3 - pAdd.assert_called_with(gs[1], p3) - assert not pRem.called assert gs[1].is_connected(p3.login) def test_game_at_another_game(mocker): - ps, gs = setup() + ps, gs, pgr = setup() data = copy.deepcopy(GAME_DICT) @@ -201,8 +185,20 @@ def test_game_at_another_game(mocker): check_relation(gs[1], ps[1], False) +def test_no_player_change_does_not_resend_game_set_signals(mocker): + ps, gs, pgr = setup() + + gUpd = mocker.Mock() + ps[1].newCurrentGame.connect(gUpd) + + data = copy.deepcopy(GAME_DICT) + data["state"] = GameState.PLAYING + gs[1].update(**data) + assert not gUpd.called + + def test_game_abort_removes_relation(mocker): - ps, gs = setup() + ps, gs, pgr = setup() gUpd = mocker.Mock() ps[1].newCurrentGame.connect(gUpd) @@ -215,7 +211,7 @@ def test_game_abort_removes_relation(mocker): def test_game_closed_removes_relation(mocker): - ps, gs = setup() + ps, gs, pgr = setup() gUpd = mocker.Mock() ps[1].newCurrentGame.connect(gUpd) @@ -232,7 +228,7 @@ def test_game_closed_removes_relation(mocker): def test_game_closed_removes_only_own(mocker): - ps, gs = setup() + ps, gs, pgr = setup() data = copy.deepcopy(GAME_DICT) data["uid"] = 2 @@ -250,7 +246,7 @@ def test_game_closed_removes_only_own(mocker): def override_tests(g1_dict, g2_dict, should): - ps, gs = setup() + ps, gs, pgr = setup() data = copy.deepcopy(GAME_DICT) data.update(g1_dict) @@ -279,32 +275,48 @@ def test_game_doesnt_override_lobby(): def test_later_game_overrides_earlier_game(): - g1 = {"state": GameState.PLAYING, - "launched_at": 1000} - g2 = {"state": GameState.PLAYING, - "launched_at": 1200} + g1 = { + "state": GameState.PLAYING, + "launched_at": 1000, + } + g2 = { + "state": GameState.PLAYING, + "launched_at": 1200, + } override_tests(g1, g2, True) def test_earlier_game_doesnt_override_later_game(): - g1 = {"state": GameState.PLAYING, - "launched_at": 1200} - g2 = {"state": GameState.PLAYING, - "launched_at": 1000} + g1 = { + "state": GameState.PLAYING, + "launched_at": 1200, + } + g2 = { + "state": GameState.PLAYING, + "launched_at": 1000, + } override_tests(g1, g2, False) def test_launchtime_overrides_no_launchtime(): - g1 = {"state": GameState.PLAYING, - "launched_at": None} - g2 = {"state": GameState.PLAYING, - "launched_at": 1000} + g1 = { + "state": GameState.PLAYING, + "launched_at": None, + } + g2 = { + "state": GameState.PLAYING, + "launched_at": 1000, + } override_tests(g1, g2, True) def test_no_launchtime_doesnt_override_launchtime(): - g1 = {"state": GameState.PLAYING, - "launched_at": 1000} - g2 = {"state": GameState.PLAYING, - "launched_at": None} + g1 = { + "state": GameState.PLAYING, + "launched_at": 1000, + } + g2 = { + "state": GameState.PLAYING, + "launched_at": None, + } override_tests(g1, g2, False) diff --git a/tests/integration_tests/model/test_player_ircuser.py b/tests/integration_tests/model/test_player_ircuser.py index 2bc7933d1..222495747 100644 --- a/tests/integration_tests/model/test_player_ircuser.py +++ b/tests/integration_tests/model/test_player_ircuser.py @@ -2,8 +2,8 @@ from model.ircuser import IrcUser from model.ircuserset import IrcUserset -from model.playerset import Playerset from model.player import Player +from model.playerset import Playerset def test_player_change(mocker): diff --git a/tests/unit_tests/client/test_gameurl.py b/tests/unit_tests/client/test_gameurl.py new file mode 100644 index 000000000..5df77e797 --- /dev/null +++ b/tests/unit_tests/client/test_gameurl.py @@ -0,0 +1,180 @@ +import pytest + +from util.gameurl import GameUrl, GameUrlType + +# NOTE - any time url format gets updated, fix below URLs to be correct +# in everything except what we test for! +# Since people can post any URL in chat they please, we need to test explicit +# url format. +# Example live replay URL: +# 'faflive://lobby.faforever.com/9876?map=Sedongs&mod=coop&uid=123456' +# Example open game URL: +# 'fafgame://lobby.faforever.com/342423/3453.SCFAreplay?map=Sedongs&mod=faf' + + +def test_example_format_passes(): + live_url = ( + 'faflive://lobby.faforever.com/342423/3453.SCFAreplay?map=Canis River' + '&mod=faf' + ) + open_url = ( + 'fafgame://lobby.faforever.com/9876?map=Sedongs&mod=coop&uid=123456' + ) + + gurl = GameUrl.from_url(live_url) + assert gurl.game_type == GameUrlType.LIVE_REPLAY + assert gurl.map == "Canis River" + assert gurl.mod == "faf" + assert gurl.uid == 342423 + assert gurl.player == "3453" + assert gurl.mods is None + + gurl = GameUrl.from_url(open_url) + assert gurl.game_type == GameUrlType.OPEN_GAME + assert gurl.map == "Sedongs" + assert gurl.mod == "coop" + assert gurl.uid == 123456 + assert gurl.player == "9876" + assert gurl.mods is None + + +def test_to_url_and_back_works(): + def test_values(gtype, map_, mod, uid, pid, mods): + gurl = GameUrl(gtype, map_, mod, uid, pid, mods) + url = gurl.to_url() + print(url) + gurl2 = GameUrl.from_url(url) + assert gurl2.game_type == gtype + assert gurl2.map == map_ + assert gurl2.mod == mod + assert gurl2.uid == uid + assert gurl2.player == pid + test_values( + GameUrlType.LIVE_REPLAY, + "Canis River", + "faf", + 342423, + "3453", + "[]", + ) + test_values( + GameUrlType.OPEN_GAME, + "Sedongs", + "coop", + 123456, + "Wesmania", + "[]", + ) + + +def test_playername_accepts_both_uid_and_name(): + live_url = ( + 'faflive://lobby.faforever.com/342423/Wesmania.SCFAreplay?map=Canis ' + 'River&mod=faf' + ) + live_url2 = ( + 'faflive://lobby.faforever.com/342423/12346.SCFAreplay?map=Canis ' + 'River&mod=faf' + ) + open_url = ( + 'fafgame://lobby.faforever.com/Wesmania?map=Sedongs&mod=coop' + '&uid=123456' + ) + open_url2 = ( + 'fafgame://lobby.faforever.com/123456?map=Sedongs&mod=coop&uid=123456' + ) + for u in [live_url, live_url2, open_url, open_url2]: + GameUrl.from_url(u) + + +def test_mods_parameter_is_optional(): + live_url = ( + 'faflive://lobby.faforever.com/342423/3453.SCFAreplay?map=Canis River' + '&mod=faf' + ) + gurl = GameUrl.from_url(live_url) + assert gurl.mods is None + + live_url = ( + 'faflive://lobby.faforever.com/342423/3453.SCFAreplay?map=Canis River' + '&mod=faf&mods=[]' + ) + gurl = GameUrl.from_url(live_url) + assert gurl.mods == '[]' + + +def test_invalid_scheme_throws_value_error(): + live_url = ( + 'http://lobby.faforever.com/342423/3453.SCFAreplay?map=Canis River' + '&mod=faf' + ) + open_url = ( + 'https://lobby.faforever.com/9876?map=Sedongs&mod=coop&uid=123456' + ) + for u in [live_url, open_url]: + with pytest.raises(ValueError): + GameUrl.from_url(u) + + +def test_missing_map_throws_value_error(): + live_url = 'faflive://lobby.faforever.com/342423/3453.SCFAreplay?mod=faf' + open_url = 'fafgame://lobby.faforever.com/9876?mod=coop&uid=123456' + for u in [live_url, open_url]: + with pytest.raises(ValueError): + GameUrl.from_url(u) + + +def test_missing_mod_throws_value_error(): + live_url = ( + 'faflive://lobby.faforever.com/342423/3453.SCFAreplay' + '?map=Canis River' + ) + open_url = 'fafgame://lobby.faforever.com/9876?map=Sedongs&uid=123456' + for u in [live_url, open_url]: + with pytest.raises(ValueError): + GameUrl.from_url(u) + + +def test_missing_uid_throws_value_error(): + live_url = ( + 'faflive://lobby.faforever.com/3453.SCFAreplay?map=Canis River&mod=faf' + ) + open_url = 'fafgame://lobby.faforever.com/9876?map=Sedongs&mod=coop' + for u in [live_url, open_url]: + with pytest.raises(ValueError): + GameUrl.from_url(u) + + +def test_bad_replay_suffix_throws_value_error(): + live_url = ( + 'faflive://lobby.faforever.com/342423/3453.blahblah?map=Canis River' + '&mod=faf' + ) + with pytest.raises(ValueError): + GameUrl.from_url(live_url) + + +def test_too_short_path_throws_value_error(): + live_url = ( + 'faflive://lobby.faforever.com/3453.SCFAreplay?map=Canis River&mod=faf' + ) + open_url = 'fafgame://lobby.faforever.com?map=Sedongs&mod=coop&uid=123456' + for u in [live_url, open_url]: + with pytest.raises(ValueError): + GameUrl.from_url(u) + + +def test_malformed_url_throws_value_error(): + for u in ["This is not a URL at all", 42, None]: + with pytest.raises(ValueError): + GameUrl.from_url(u) + + +def test_schema_determines_if_url_is_game(): + game1 = 'faflive://' + game2 = 'fafgame://' + notgame = 'http://' + + for u in [game1, game2]: + assert GameUrl.is_game_url(u) + assert not GameUrl.is_game_url(notgame) diff --git a/tests/unit_tests/client/test_mouse_position.py b/tests/unit_tests/client/test_mouse_position.py new file mode 100644 index 000000000..862874e9f --- /dev/null +++ b/tests/unit_tests/client/test_mouse_position.py @@ -0,0 +1,42 @@ +import pytest +from PyQt6.QtCore import QPoint + + +@pytest.mark.parametrize("x,y", [(0, 0)]) +def test_mouse_position(mouse_position, x: int, y: int): + point = QPoint() + point.setX(x) + point.setY(y) + + assert not mouse_position.on_left_edge + assert not mouse_position.on_right_edge + assert not mouse_position.on_top_edge + assert not mouse_position.on_bottom_edge + assert not mouse_position.on_top_left_edge + assert not mouse_position.on_bottom_left_edge + assert not mouse_position.on_top_right_edge + assert not mouse_position.on_bottom_right_edge + assert not mouse_position.is_on_edge() + + mouse_position.update_mouse_position(point) + assert mouse_position.on_left_edge + assert not mouse_position.on_right_edge + assert mouse_position.on_top_edge + assert not mouse_position.on_bottom_edge + assert mouse_position.on_top_left_edge + assert not mouse_position.on_bottom_left_edge + assert not mouse_position.on_top_right_edge + assert not mouse_position.on_bottom_right_edge + assert mouse_position.is_on_edge() + + mouse_position.reset_to_false() + + assert not mouse_position.on_left_edge + assert not mouse_position.on_right_edge + assert not mouse_position.on_top_edge + assert not mouse_position.on_bottom_edge + assert not mouse_position.on_top_left_edge + assert not mouse_position.on_bottom_left_edge + assert not mouse_position.on_top_right_edge + assert not mouse_position.on_bottom_right_edge + assert not mouse_position.is_on_edge() diff --git a/tests/unit_tests/client/test_updating.py b/tests/unit_tests/client/test_updating.py index ffb27f479..a0c97e64c 100644 --- a/tests/unit_tests/client/test_updating.py +++ b/tests/unit_tests/client/test_updating.py @@ -16,10 +16,16 @@ def test_client_sends_current_version(qtbot, mocker): assert args[0]['version'] == config.VERSION -@pytest.mark.skipif(True, reason="Run this manually to test client update downloading") +# TODO: bad test, should be rewritten +@pytest.mark.skipif( + True, + reason="Run this manually to test client update downloading", +) def test_client_updater(qtbot): from client.updater import ClientUpdater - updater = ClientUpdater("http://content.faforever.com/FAForever-0.10.125.msi") + updater = ClientUpdater( + "http://content.faforever.com/FAForever-0.10.125.msi", + ) updater.exec_() qtbot.stop() diff --git a/tests/unit_tests/model/chat/test_channel.py b/tests/unit_tests/model/chat/test_channel.py new file mode 100644 index 000000000..150c6cf20 --- /dev/null +++ b/tests/unit_tests/model/chat/test_channel.py @@ -0,0 +1,24 @@ +import pytest + +from model.chat.channel import Channel, ChannelID, ChannelType + + +@pytest.fixture +def lines(mocker): + return mocker.Mock(spec_set=[]) + + +def test_setting_topic(lines, mocker): + old_topic = "" + new_topic = "The gloves are comming off." + + def check_update(new, old): + assert new.topic == new_topic + assert old.topic == old_topic + + cid = ChannelID(ChannelType.PUBLIC, "aeolus") + channel = Channel(cid, lines, old_topic) + topic_call = mocker.Mock() + channel.updated.connect(topic_call) + channel.updated.connect(check_update) + channel.set_topic(new_topic) diff --git a/tests/unit_tests/model/chat/test_channelchatter.py b/tests/unit_tests/model/chat/test_channelchatter.py new file mode 100644 index 000000000..2223b2002 --- /dev/null +++ b/tests/unit_tests/model/chat/test_channelchatter.py @@ -0,0 +1,39 @@ +import pytest + +from model.chat.channelchatter import ChannelChatter + + +@pytest.fixture +def channel(mocker): + return mocker.Mock(spec_set=["id_key"]) + + +@pytest.fixture +def chatter(mocker): + return mocker.Mock(spec_set=["id_key"]) + + +def test_id_is_tuple_of_channel_chatter_ids(channel, chatter): + channel.id_key = "channel" + chatter.id_key = "chatter" + + cc = ChannelChatter(channel, chatter, "") + assert cc.id_key == (channel.id_key, chatter.id_key) + + +def test_setting_elevation(channel, chatter, mocker): + old_el = "" + new_el = "~" + + def check_update(new, old): + assert new.elevation == new_el + assert old.elevation == old_el + + cc = ChannelChatter(channel, chatter, old_el) + + call = mocker.Mock() + cc.updated.connect(call) + cc.updated.connect(check_update) + cc.set_elevation(new_el) + + assert call.called diff --git a/tests/unit_tests/model/chat/test_channelset.py b/tests/unit_tests/model/chat/test_channelset.py new file mode 100644 index 000000000..56122c8be --- /dev/null +++ b/tests/unit_tests/model/chat/test_channelset.py @@ -0,0 +1,76 @@ +import pytest + +from model.chat.channel import ChannelID, ChannelType +from model.chat.channelset import Channelset + + +class MockChannels(): + def __init__(self, mock): + self._mock = mock + + def get(self, cid): + mock_channel = self._mock.Mock(spec_set=["id_key", "is_base"]) + mock_channel.id_key = cid + return mock_channel + + +@pytest.fixture +def channels(mocker): + return MockChannels(mocker) + + +def test_adding_channel(channels, mocker): + added = mocker.Mock() + channelset = Channelset([]) + channelset.added.connect(added) + + cid = ChannelID(ChannelType.PUBLIC, "aeolus") + new_channel = channels.get(cid) + channelset[cid] = new_channel + + assert channelset[cid] is new_channel + added.assert_called_with(new_channel) + assert len(channelset) == 1 + assert [cid for cid in channelset] == [cid] + + +def test_removing_channel(channels, mocker): + removed = mocker.Mock() + channelset = Channelset([]) + channelset.removed.connect(removed) + + cid = ChannelID(ChannelType.PUBLIC, "aeolus") + new_channel = channels.get(cid) + channelset[cid] = new_channel + assert not removed.called + + del channelset[cid] + assert cid not in channelset + removed.assert_called_with(new_channel) + assert len(channelset) == 0 + assert [cid for cid in channelset] == [] + + +def test_adding_mismatched_cid_is_value_error(channels): + channelset = Channelset([]) + cid = ChannelID(ChannelType.PUBLIC, "aeolus") + cid2 = ChannelID(ChannelType.PUBLIC, "odysseus") + cid3 = ChannelID(ChannelType.PRIVATE, "aeolus") + new_channel = channels.get(cid) + + with pytest.raises(ValueError): + channelset[cid2] = new_channel + with pytest.raises(ValueError): + channelset[cid3] = new_channel + + +def test_adding_same_cid_twice_is_value_error(channels): + channelset = Channelset([]) + cid1 = ChannelID(ChannelType.PUBLIC, "aeolus") + cid2 = ChannelID(ChannelType.PUBLIC, "aeolus") + new_channel1 = channels.get(cid1) + new_channel2 = channels.get(cid2) + + channelset[cid1] = new_channel1 + with pytest.raises(ValueError): + channelset[cid2] = new_channel2 diff --git a/tests/unit_tests/model/chat/test_lines.py b/tests/unit_tests/model/chat/test_lines.py new file mode 100644 index 000000000..78a6e70f5 --- /dev/null +++ b/tests/unit_tests/model/chat/test_lines.py @@ -0,0 +1,97 @@ +import pytest + +from model.chat.channel import Lines + + +def test_lines_dont_care_about_line_internals(): + o = object() + + for item in [1, "a", o]: + lines = Lines() + lines.add_line(item) + assert [i for i in lines] == [item] + + +def test_lines_add_latest_last(): + lines = Lines() + for item in range(5): + lines.add_line(item) + + assert [i for i in lines] == list(range(5)) + + +def test_lines_emit_add_remove_signals(mocker): + lines = Lines() + added = mocker.Mock() + removed = mocker.Mock() + lines.added.connect(added) + lines.removed.connect(removed) + + lines.add_line("a") + assert added.called + assert not removed.called + added.reset_mock() + + lines.remove_lines(1) + removed.assert_called_with(1) + assert not added.called + + +def test_lines_remove_acts_like_queue(): + lines = Lines() + for item in range(5): + lines.add_line(item) + + lines.remove_lines(2) + assert [i for i in lines] == [2, 3, 4] + + +def test_lines_len(): + lines = Lines() + for item in range(5): + lines.add_line(item) + lines.remove_lines(2) + assert len(lines) == 3 + + +def test_remove_more_lines_than_len_removes_len_lines(mocker): + lines = Lines() + removed = mocker.Mock() + lines.removed.connect(removed) + + for item in range(5): + lines.add_line(item) + + lines.remove_lines(15) + removed.assert_called_with(5) + assert len(lines) == 0 + assert [i for i in lines] == [] + + +def test_lines_zero_remove_does_nothing(mocker): + lines = Lines() + removed = mocker.Mock() + lines.removed.connect(removed) + + for item in range(5): + lines.add_line(item) + + lines.remove_lines(0) + assert not removed.called + assert [i for i in lines] == list(range(5)) + + +def test_remove_on_empty_list_does_nothing(mocker): + lines = Lines() + removed = mocker.Mock() + lines.removed.connect(removed) + + lines.remove_lines(15) + assert not removed.called + assert [i for i in lines] == [] + + +def test_negative_remove_number_is_value_error(): + lines = Lines() + with pytest.raises(ValueError): + lines.remove_lines(-5) diff --git a/tests/unit_tests/model/test_game.py b/tests/unit_tests/model/test_game.py index 0c191ef01..e13d23742 100644 --- a/tests/unit_tests/model/test_game.py +++ b/tests/unit_tests/model/test_game.py @@ -1,24 +1,24 @@ -import pytest import copy +import pytest + from model import game DEFAULT_DICT = { - "uid": 1, + "uid": 1, "state": game.GameState.OPEN, "launched_at": 10000, "num_players": 3, "max_players": 8, "title": "Sentons sucks", - "host": "IllIIIlIlIIIlI", + "host": "IllIIIlIlIIIlI", "mapname": "Sentons Ultimate 6v6", "map_file_path": "xrca_co_000001.scfamap", "teams": { 1: ["IllIIIlIlIIIlI", "TableNoob"], - 2: ["Kraut"] - }, + 2: ["Kraut"], + }, "featured_mod": "faf", - "featured_mod_versions": {}, "sim_mods": {}, "password_protected": False, "visibility": game.GameVisibility.PUBLIC, @@ -45,8 +45,8 @@ def check_signal(new, old): assert old.host == "IllIIIlIlIIIlI" assert new.host == "OtherName" - g.gameUpdated.connect(updated) - g.gameUpdated.connect(check_signal) + g.updated.connect(updated) + g.updated.connect(check_signal) data["host"] = "OtherName" g.update(**data) assert updated.called diff --git a/tests/unit_tests/model/test_gameset.py b/tests/unit_tests/model/test_gameset.py index e180da7f0..19f18be43 100644 --- a/tests/unit_tests/model/test_gameset.py +++ b/tests/unit_tests/model/test_gameset.py @@ -1,24 +1,24 @@ -import pytest import copy -from model import gameset, game +import pytest + +from model import game, gameset DEFAULT_DICT = { - "uid": 1, + "uid": 1, "state": game.GameState.OPEN, "launched_at": 10000, "num_players": 3, "max_players": 8, "title": "Sentons sucks", - "host": "IllIIIlIlIIIlI", + "host": "IllIIIlIlIIIlI", "mapname": "Sentons Ultimate 6v6", "map_file_path": "xrca_co_000001.scfamap", "teams": { 1: ["IllIIIlIlIIIlI", "TableNoob"], - 2: ["Kraut"] - }, + 2: ["Kraut"], + }, "featured_mod": "faf", - "featured_mod_versions": {}, "sim_mods": {}, "password_protected": False, "visibility": game.GameVisibility.PUBLIC, @@ -34,7 +34,7 @@ def test_add_update(mocker, playerset): data = copy.deepcopy(DEFAULT_DICT) s = gameset.Gameset(playerset=playerset) newgame = mocker.Mock() - s.newGame.connect(newgame) + s.added.connect(newgame) s[1] = game.Game(playerset=playerset, **data) assert 1 in s diff --git a/tests/unit_tests/model/test_ircuserset.py b/tests/unit_tests/model/test_ircuserset.py index f9722475f..e0953bd9d 100644 --- a/tests/unit_tests/model/test_ircuserset.py +++ b/tests/unit_tests/model/test_ircuserset.py @@ -18,10 +18,10 @@ def test_user_signal(sp): newuser = mocker.Mock() goneuser = mocker.Mock() - ps.userAdded.connect(newuser) - ps.userAdded.connect(test_user_signal) - ps.userRemoved.connect(goneuser) - ps.userRemoved.connect(test_user_signal) + ps.added.connect(newuser) + ps.added.connect(test_user_signal) + ps.removed.connect(goneuser) + ps.removed.connect(test_user_signal) ps[p.name] = p assert newuser.called diff --git a/tests/unit_tests/model/test_player.py b/tests/unit_tests/model/test_player.py index 19ae95611..8480dd4ab 100644 --- a/tests/unit_tests/model/test_player.py +++ b/tests/unit_tests/model/test_player.py @@ -1,19 +1,32 @@ from model.player import Player +from model.rating import RatingType DEFAULT_DICT = { - "id_": 17, + "id_": 17, "login": "TesterNoob", - "global_rating": (1455, 160), - "ladder_rating": (1192, 216), - "number_of_games": 374, + "ratings": { + "global": { + "rating": (1455, 160), + "number_of_games": 374, + }, + "ladder_1v1": { + "rating": (1192, 216), + "number_of_games": 374, + }, + "tmm_2v2": { + "rating": (888, 88), + "number_of_games": 88, + }, + }, "avatar": { 'url': 'http://content.faforever.com/faf/avatars/GW_Cybran.png', - 'tooltip': 'Liberate !'}, - "country": "PL", + 'tooltip': 'Liberate !', + }, + "country": "PL", } NONOPTIONAL_DICT = { - "id_": 17, + "id_": 17, "login": "TesterNoob", } @@ -31,12 +44,33 @@ def test_update_signal(mocker): updated = mocker.Mock() def check_signal(new, old): - assert old.number_of_games == 374 - assert new.number_of_games == 375 + assert old.global_estimate == (1455 - 3 * 160) + assert new.global_estimate == (1456 - 3 * 140) + assert old.game_count() == 374 + assert new.game_count() == 375 + assert old.number_of_games == 374 + 374 + 88 + assert new.number_of_games == 375 + 374 + 88 + assert old.ladder_estimate == (1192 - 3 * 216) + assert new.ladder_estimate == (1192 - 3 * 216) p.updated.connect(updated) p.updated.connect(check_signal) - p.update(number_of_games=375) + p.update( + ratings={ + "global": { + "rating": (1456, 140), + "number_of_games": 375, + }, + "ladder_1v1": { + "rating": (1192, 216), + "number_of_games": 374, + }, + "tmm_2v2": { + "rating": (888, 88), + "number_of_games": 88, + }, + }, + ) assert updated.called @@ -54,3 +88,45 @@ def test_player_equality(): def test_player_indexing(): p = Player(id_=1, login='x') assert {1: p}[1] == {p: p}[p] + + +def test_player_repr(): + p = Player(**DEFAULT_DICT) + assert str(p) == ( + "Player(id=17, login=TesterNoob, global_rating=(1455, 160), " + "ladder_rating=(1192, 216))" + ) + + +def test_player_fields(): + p = Player(**DEFAULT_DICT) + assert p.login == "TesterNoob" + assert p.id == 17 + assert p.ratings is not None + assert isinstance(p.ratings, dict) is True + assert p.country == "PL" + assert p.clan is None + assert p.league is None + assert p.avatar == { + 'url': 'http://content.faforever.com/faf/avatars/GW_Cybran.png', + 'tooltip': 'Liberate !', + } + + +def test_missing_ratings(): + p = Player(**DEFAULT_DICT) + p.update(ratings={}) + assert p.number_of_games == 0 + assert p.ladder_estimate == 0 + assert p.global_estimate == 0 + for rating_type in list(RatingType): + assert p.rating_mean(rating_type.value) == 1500 + assert p.rating_deviation(rating_type.value) == 500 + assert p.rating_estimate(rating_type.value) == 0 + assert p.game_count(rating_type.value) == 0 + + +def test_missing_number_of_games(): + p = Player(**DEFAULT_DICT) + p.update(ratings={"global": {"rating": (1500, 500)}}) + assert p.number_of_games == 0 diff --git a/tests/unit_tests/model/test_playerset.py b/tests/unit_tests/model/test_playerset.py index 2331a7c66..000c19840 100644 --- a/tests/unit_tests/model/test_playerset.py +++ b/tests/unit_tests/model/test_playerset.py @@ -4,15 +4,27 @@ from model.playerset import Playerset DEFAULT_DICT = { - "id_": 17, + "id_": 17, "login": "TesterNoob", - "global_rating": (1455, 160), - "ladder_rating": (1192, 216), - "number_of_games": 374, + "ratings": { + "global": { + "rating": (1455, 160), + "number_of_games": 374, + }, + "ladder_1v1": { + "rating": (1192, 216), + "number_of_games": 374, + }, + "tmm_2v2": { + "rating": (888, 88), + "number_of_games": 88, + }, + }, "avatar": { 'url': 'http://content.faforever.com/faf/avatars/GW_Cybran.png', - 'tooltip': 'Liberate !'}, - "country": "PL", + 'tooltip': 'Liberate !', + }, + "country": "PL", } @@ -25,10 +37,10 @@ def test_player_signal(sp): newplayer = mocker.Mock() goneplayer = mocker.Mock() - ps.playerAdded.connect(newplayer) - ps.playerAdded.connect(test_player_signal) - ps.playerRemoved.connect(goneplayer) - ps.playerRemoved.connect(test_player_signal) + ps.added.connect(newplayer) + ps.added.connect(test_player_signal) + ps.removed.connect(goneplayer) + ps.removed.connect(test_player_signal) ps[p.id] = p assert newplayer.called diff --git a/tests/unit_tests/themes/test_theme.py b/tests/unit_tests/themes/test_theme.py index 9093b8613..0988cdb06 100644 --- a/tests/unit_tests/themes/test_theme.py +++ b/tests/unit_tests/themes/test_theme.py @@ -1,18 +1,17 @@ -import pytest +from semantic_version import Version from util import Theme -from semantic_version import Version THEME_FILE_FUNS = [ - "pixmap", - "loadUi", - "loadUiType", - "readlines", - "readstylesheet", - "themeurl", - "readfile", - "sound", - ] + "pixmap", + "loadUi", + "loadUiType", + "readlines", + "readstylesheet", + "themeurl", + "readfile", + "sound", +] def test_theme_with_empty_dir_keeps_filename(tmpdir): @@ -35,30 +34,30 @@ def test_missing_files_return_none(tmpdir): theme = Theme(str(themedir), "") for fun in THEME_FILE_FUNS: - assert getattr(theme, fun)("file") == None + assert getattr(theme, fun)("file") is None theme = Theme(None, "") for fun in THEME_FILE_FUNS: - assert getattr(theme, fun)(str(themedir.join("file"))) == None + assert getattr(theme, fun)(str(themedir.join("file"))) is None def test_missing_version_returns_none(tmpdir): themedir = tmpdir.mkdir("theme") theme = Theme(str(themedir), "") - assert theme.version() == None + assert theme.version() is None def test_empty_dir_theme_version_returns_none(tmpdir): - themedir = tmpdir.mkdir("theme") + tmpdir.mkdir("theme") theme = Theme(None, "") - assert theme.version() == None + assert theme.version() is None def test_malformed_version_returns_none(tmpdir): themedir = tmpdir.mkdir("theme") themedir.join("version").write("1.0blergh") theme = Theme(str(themedir), "") - assert theme.version() == None + assert theme.version() is None def test_version_correctly_read(tmpdir): @@ -71,18 +70,18 @@ def test_version_correctly_read(tmpdir): def test_pixmap_cache_caches(tmpdir, mocker): - with mocker.patch('PyQt5.QtGui.QPixmap', side_effect = [1, 2]) as pixmock: - themedir = tmpdir.mkdir("theme") - themedir.join("file").write("content") - themedir.join("second_file").write("content") - theme = Theme(str(themedir), "") - - first = theme.pixmap("file") - still_first = theme.pixmap("file") - second = theme.pixmap("second_file") - - assert first is not None and second is not None - assert first is still_first - assert first is not second + mocker.patch('PyQt6.QtGui.QPixmap', side_effect=[1, 2]) + themedir = tmpdir.mkdir("theme") + themedir.join("file").write("content") + themedir.join("second_file").write("content") + theme = Theme(str(themedir), "") + + first = theme.pixmap("file") + still_first = theme.pixmap("file") + second = theme.pixmap("second_file") + + assert first is not None and second is not None + assert first is still_first + assert first is not second # TODO - tests for specific results of functions diff --git a/tests/unit_tests/themes/test_themeset.py b/tests/unit_tests/themes/test_themeset.py index dbe970768..c761dcc03 100644 --- a/tests/unit_tests/themes/test_themeset.py +++ b/tests/unit_tests/themes/test_themeset.py @@ -1,38 +1,49 @@ -import pytest +from semantic_version import Version from util import ThemeSet -from semantic_version import Version THEME_FILE_FUNS = [ - "pixmap", - "loadUi", - "loadUiType", - "readlines", - "readstylesheet", - "themeurl", - "readfile", - "sound", - ] + "pixmap", + "loadUi", + "loadUiType", + "readlines", + "readstylesheet", + "themeurl", + "readfile", + "sound", +] def test_basic_init(mocker): theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) + setting_mock.configure_mock(get=lambda x, y=None: None) - ts = ThemeSet([], theme_mock, setting_mock, "1.0.0") + ThemeSet([], theme_mock, setting_mock, "1.0.0") def test_list_themes(mocker): def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") + def_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="default", + themedir="", + ) theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) + setting_mock.configure_mock(get=lambda x, y=None: None) ts = ThemeSet([theme_mock], def_mock, setting_mock, "1.0.0") @@ -45,14 +56,26 @@ def test_list_themes(mocker): def test_set_theme(mocker): def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") + def_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="default", + themedir="", + ) theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) other_t_mock = mocker.Mock() - other_t_mock.configure_mock(version = lambda: Version("1.0.0"), name = "other", themedir = "") + other_t_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="other", + themedir="", + ) setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) + setting_mock.configure_mock(get=lambda x, y=None: None) ts = ThemeSet([theme_mock, other_t_mock], def_mock, setting_mock, "1.0.0") @@ -71,12 +94,20 @@ def test_set_theme(mocker): def test_wrong_set_theme(mocker): def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") + def_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="default", + themedir="", + ) theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) + setting_mock.configure_mock(get=lambda x, y=None: None) ts = ThemeSet([theme_mock], def_mock, setting_mock, "1.0.0") ts.setTheme("wrong", False) @@ -86,15 +117,27 @@ def test_wrong_set_theme(mocker): def test_loadTheme(mocker): def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") + def_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="default", + themedir="", + ) theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) other_t_mock = mocker.Mock() - other_t_mock.configure_mock(version = lambda: Version("1.0.0"), name = "other", themedir = "") + other_t_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="other", + themedir="", + ) setting_mock = mocker.Mock() # Don't track option name, but make sure something is read - setting_mock.configure_mock(get = (lambda x, y = None: "theme")) + setting_mock.configure_mock(get=(lambda x, y=None: "theme")) ts = ThemeSet([theme_mock], def_mock, setting_mock, "1.0.0") theme = ts.theme @@ -104,27 +147,40 @@ def test_loadTheme(mocker): theme = ts.theme assert theme == theme_mock - setting_mock.configure_mock(get = (lambda x, y = None: None)) + setting_mock.configure_mock(get=(lambda x, y=None: None)) ts.loadTheme() theme = ts.theme assert theme == def_mock + def test_returns_when_not_found(mocker): - mocker.patch("PyQt5.QtMultimedia.QSound") - mocker.patch("PyQt5.QtGui.QPixmap") + mocker.patch("PyQt6.QtMultimedia.QSoundEffect") + mocker.patch("PyQt6.QtGui.QPixmap") setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) + setting_mock.configure_mock(get=lambda x, y=None: None) def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") + def_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="default", + themedir="", + ) theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) unthemed = mocker.Mock() - unthemed.configure_mock(version = lambda: Version("1.0.0"), name = "", themedir = "") + unthemed.configure_mock( + version=lambda: Version("1.0.0"), + name="", + themedir="", + ) ts = ThemeSet([theme_mock], def_mock, setting_mock, "1.0.0", unthemed) - ts.setTheme("theme", restart = False) + ts.setTheme("theme", restart=False) # Make mocks return None for theme in [def_mock, theme_mock, unthemed]: @@ -133,32 +189,43 @@ def test_returns_when_not_found(mocker): for fn in THEME_FILE_FUNS: getattr(theme, fn).return_value = None - # Don't return none in pixmap even if we don't find one assert ts.pixmap("name") is not None - assert ts.pixmap("name", themed = True) is not None - assert ts.pixmap("name", themed = False) is not None + assert ts.pixmap("name", themed=True) is not None + assert ts.pixmap("name", themed=False) is not None # All others should return None if they don't find the result for fn in [f for f in THEME_FILE_FUNS if f not in ["pixmap", "sound"]]: assert (getattr(ts, fn)("name")) is None - assert (getattr(ts, fn)("name", themed = True)) is None - assert (getattr(ts, fn)("name", themed = False)) is None + assert (getattr(ts, fn)("name", themed=True)) is None + assert (getattr(ts, fn)("name", themed=False)) is None def test_theme_call_order(mocker): - mocker.patch("PyQt5.QtMultimedia.QSound") - mocker.patch("PyQt5.QtGui.QPixmap") + mocker.patch("PyQt6.QtCore.QUrl.fromLocalFile") + mocker.patch("PyQt6.QtGui.QPixmap") setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) + setting_mock.configure_mock(get=lambda x, y=None: None) def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") + def_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="default", + themedir="", + ) theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") + theme_mock.configure_mock( + version=lambda: Version("1.0.0"), + name="theme", + themedir="", + ) unthemed = mocker.Mock() - unthemed.configure_mock(version = lambda: Version("1.0.0"), name = "", themedir = "") + unthemed.configure_mock( + version=lambda: Version("1.0.0"), + name="", + themedir="", + ) all_mocks = [def_mock, theme_mock, unthemed] @@ -170,9 +237,10 @@ def test_theme_call_order(mocker): # Tests if all THEME_FILE_FUNS functions call themes and only # themes from should_call in their specified order. - def test_run(should_call, themed = None): + def test_run(should_call, themed=None): for fn in THEME_FILE_FUNS: - theme_ids = dict((e, "e" + str(i)) for (i, e) in enumerate(all_mocks)) + theme_ids = dict((e, "e" + str(i)) + for (i, e) in enumerate(all_mocks)) manager = mocker.Mock() for theme in all_mocks: manager.attach_mock(theme, theme_ids[theme]) @@ -185,44 +253,22 @@ def test_run(should_call, themed = None): getattr(ts, fn)("mock", themed) assert [c[0] for c in manager.mock_calls] == call_names - test_run([def_mock]) # Default theme returns something - test_run([def_mock], True) # Same if we explicitly theme - test_run([unthemed], False) # Unthemed returns something + test_run([def_mock]) # Default theme returns something + test_run([def_mock], True) # Same if we explicitly theme + test_run([unthemed], False) # Unthemed returns something - ts.setTheme("theme", restart = False) - test_run([theme_mock]) # Find things in set theme - test_run([theme_mock], True) # Same if we explicitly theme - test_run([unthemed], False) # Use unthemed + ts.setTheme("theme", restart=False) + test_run([theme_mock]) # Find things in set theme + test_run([theme_mock], True) # Same if we explicitly theme + test_run([unthemed], False) # Use unthemed for fn in THEME_FILE_FUNS: getattr(theme_mock, fn).return_value = None - test_run([theme_mock, def_mock]) # Try mock first, then fallback to default - test_run([theme_mock, def_mock], True) # Same if we explicitly theme - test_run([unthemed], False) # Use unthemed - - -def test_stylesheets(mocker): - def_mock = mocker.Mock() - def_mock.configure_mock(version = lambda: Version("1.0.0"), name = "default", themedir = "") - theme_mock = mocker.Mock() - theme_mock.configure_mock(version = lambda: Version("1.0.0"), name = "theme", themedir = "") - - setting_mock = mocker.Mock() - setting_mock.configure_mock(get = lambda x, y = None: None) - - style_mock = mocker.Mock() - sheet_mock = mocker.Mock() - style_mock.attach_mock(sheet_mock, "setStyleSheet") - - ts = ThemeSet([theme_mock], def_mock, setting_mock, "1.0.0") - - ts.setStyleSheet(style_mock, "filename") - assert sheet_mock.called - sheet_mock.reset_mock() - - ts.reloadStyleSheets() - assert sheet_mock.called + # Try mock first, then fallback to default + test_run([theme_mock, def_mock]) + test_run([theme_mock, def_mock], True) # Same if we explicitly theme + test_run([unthemed], False) # Use unthemed # TODO - add more setTheme tests once we remove using qt dialogs from themeset