Compare commits

..

8 Commits

Author SHA1 Message Date
Mieszko Bańczerowski
96cb48fcaf Increment version 2020-09-18 11:01:55 +02:00
Mieszko Banczerowski
17b0542fdf GPI-1232 Synchronous importer for local sizes 2020-09-16 13:33:17 +02:00
Mieszko Banczerowski
0cf447bdcf Increment vesion 2020-06-24 16:04:20 +02:00
Mieszko Banczerowski
259702e0de GPI-1396 Add issue templates and external links 2020-06-23 11:18:08 +02:00
mbanczerowski
b96c55397e Fix typo in PLATFORM_IDs.md (#161) 2020-06-23 10:56:16 +02:00
Mieszko Banczerowski
f82cab2770 GPI-1399: Update get_local_size docs 2020-06-22 11:12:12 +02:00
Robert Korulczyk
1e7c284035 Fix typo 2020-06-19 22:19:45 +02:00
Mieszko Banczerowski
0c49ee315e Updates missing ids to PLATFORM_ID.md 2020-06-18 17:31:16 +02:00
7 changed files with 63 additions and 14 deletions

11
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -0,0 +1,11 @@
blank_issues_enabled: true
contact_links:
- name: GOG GALAXY 2.0 issue
url: https://mantis2.gog.com/
about: Report issues related to GOG GALAXY 2.0, official integrations or the whole ecosystem
- name: Platform ID request
url: https://github.com/gogcom/galaxy-integrations-python-api/issues/160
about: Report missing platform id
- name: Community integrations
url: https://github.com/Mixaill/awesome-gog-galaxy
about: Find integrations and their maintainers, request new integrations or report issues related to unofficial integrations.

View File

@@ -0,0 +1,14 @@
---
name: API issue
about: Report a bug or problem with current API architecture
---
**Problem**
<!-- Describe the problem you faced. -->
**Solution**
<!-- Describe the solution you'd like. -->
**Alternatives**
<!-- Optionally describe possible alternatives or current workarounds if any. -->

View File

@@ -80,3 +80,12 @@ Platform ID list for GOG Galaxy 2.0 Integrations
| nds | Nintendo DS |
| 3ds | Nintendo 3DS |
| pathofexile | Path of Exile |
| twitch | Twitch |
| minecraft | Minecraft |
| gamesessions | GameSessions |
| nuuvem | Nuuvem |
| fxstore | FX Store |
| indiegala | IndieGala |
| playfire | Playfire |
| oculus | Oculus |
| rockstar | Rockstar |

View File

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="galaxy.plugin.api",
version="0.65.1",
version="0.67.0",
description="GOG Galaxy Integrations Python API",
author='Galaxy team',
author_email='galaxy@gog.com',

View File

@@ -87,3 +87,16 @@ class CollectionImporter(Importer):
self._notification_failure(id_, UnknownError())
finally:
self._notification_partially_finished(id_)
class SynchroneousImporter(Importer):
async def _import_elements(self, ids_, context_):
try:
for id_ in ids_:
await self._import_element(id_, context_)
self._notification_finished()
self._complete()
except asyncio.CancelledError:
logger.debug("Importing %s cancelled", self._name)
finally:
self._import_in_progress = False

View File

@@ -13,7 +13,7 @@ from galaxy.api.types import (
Subscription, SubscriptionGame
)
from galaxy.task_manager import TaskManager
from galaxy.api.importer import Importer, CollectionImporter
from galaxy.api.importer import Importer, CollectionImporter, SynchroneousImporter
logger = logging.getLogger(__name__)
@@ -104,7 +104,7 @@ class Plugin:
self._user_presence_import_finished,
self.user_presence_import_complete
)
self._local_size_importer = Importer(
self._local_size_importer = SynchroneousImporter(
self._external_task_manager,
"local size",
self.get_local_size,
@@ -1027,10 +1027,9 @@ class Plugin:
It is preferable to avoid iterating over local game files when overriding this method.
If possible, please use a more efficient way of game size retrieval.
:param game_id: the id of the installed game
:param context: the value returned from :meth:`prepare_local_size_context`
:return: game size (in bytes) or `None` if game size cannot be determined;
'0' if the game is not installed, or if it is not present locally (e.g. installed
on another machine and accessible via remote connection, playable via web browser etc.)
:return: the size of the game on a user-owned storage device (in bytes) or `None` if the size cannot be determined
"""
raise NotImplementedError()

View File

@@ -19,7 +19,7 @@ async def test_get_local_size_success(plugin, read, write):
}
read.side_effect = [async_return_value(create_message(request)), async_return_value(b"", 10)]
plugin.get_local_size.side_effect = [
async_return_value(100000000000),
async_return_value(100000000000, 1),
async_return_value(None),
async_return_value(3333333)
]
@@ -89,12 +89,15 @@ async def test_get_local_size_error(exception, code, message, plugin, read, writ
plugin.get_local_size.assert_called()
plugin.local_size_import_complete.assert_called_once_with()
assert get_messages(write) == [
{
"jsonrpc": "2.0",
"id": request_id,
"result": None
},
direct_response = {
"jsonrpc": "2.0",
"id": request_id,
"result": None
}
responses = get_messages(write)
assert direct_response in responses
responses.remove(direct_response)
assert responses == [
{
"jsonrpc": "2.0",
"method": "local_size_import_failure",
@@ -145,6 +148,7 @@ async def test_prepare_get_local_size_context_error(plugin, read, write):
@pytest.mark.asyncio
async def test_import_already_in_progress_error(plugin, read, write):
plugin.prepare_local_size_context.return_value = async_return_value(None)
plugin.get_local_size.return_value = async_return_value(100, 5)
requests = [
{
"jsonrpc": "2.0",
@@ -185,4 +189,3 @@ async def test_import_already_in_progress_error(plugin, read, write):
"message": "Import already in progress"
}
} in responses