python3-discogs-client 2.7__tar.gz → 2.8__tar.gz

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: python3-discogs-client
-Version: 2.7
+Version: 2.8
 Summary: Python API client for Discogs
 Home-page: https://github.com/joalla/discogs_client
 Author: joalla
@@ -14,5 +14,20 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Communications
 Classifier: Topic :: Utilities
 License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: oauthlib
+Requires-Dist: python-dateutil
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: pydata-sphinx-theme; extra == "docs"
+Requires-Dist: myst-parser; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 This is an active fork of the official "Discogs API client for Python", which was deprecated by discogs.com as of June 2020. We think it is a very useful Python module and decided to continue maintaining it. Please visit: https://github.com/joalla/discogs_client for more information.

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/discogs_client/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.7'
+__version__ = '2.8'
 __version_info__ = tuple(int(i) for i in __version__.split('.') if i.isdigit())
 
 from discogs_client.client import Client

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/discogs_client/fetchers.py

@@ -224,7 +224,7 @@ class OAuth2Fetcher(Fetcher):
 class FilesystemFetcher(Fetcher):
     """Fetches from a directory of files."""
     default_response = json.dumps({'message': 'Resource not found.'}), 404
-    path_with_params = re.compile('(?P<dir>(\w+/)+)(?P<query>\w+)\?(?P<params>.*)')
+    path_with_params = re.compile(r'(?P<dir>(\w+/)+)(?P<query>\w+)\?(?P<params>.*)')
 
     def __init__(self, base_path):
         self.base_path = base_path

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/discogs_client/models.py

@@ -745,7 +745,7 @@ class CollectionFolder(PrimaryAPIObject):
     count = SimpleField()  #:
 
     def __init__(self, client, dict_):
-        super(CollectionFolder, self).__init__(client, dict_)
+        super().__init__(client, dict_)
 
     @property
     def releases(self):
@@ -754,14 +754,34 @@ class CollectionFolder(PrimaryAPIObject):
 
     def add_release(self, release):
         release_id = release.id if isinstance(release, Release) else release
-        add_release_url = self.fetch('resource_url') + '/releases/{}'.format(release_id)
-        self.client._post(add_release_url, None)
+        resource_url = self.fetch('resource_url')
+        self.client._post(f"{resource_url}/releases/{release_id}", None)
 
     def remove_release(self, instance):
+        """Remove a collection item entirely.
+        """
         if not isinstance(instance, CollectionItemInstance):
             raise TypeError('instance must be of type CollectionItemInstance')
-        instance_url = self.fetch('resource_url') + '/releases/{0}/instances/{1}'.format(instance.id, instance.instance_id)
-        self.client._delete(instance_url)
+        resource_url = self.fetch('resource_url')
+        self.client._delete(f"{resource_url}/releases/{instance.id}/instances/{instance.instance_id}")
+
+    def move_release(self, instance, target_folder_id):
+        """Move a collection item to another folder.
+
+        Moving to folder id 1 moves to the "Uncategorized" folder.
+        """
+        if not isinstance(instance, CollectionItemInstance):
+            raise TypeError('instance must be of type CollectionItemInstance')
+        resource_url = self.fetch('resource_url')
+        self.client._post(
+            f"{resource_url}/releases/{instance.id}/instances/{instance.instance_id}",
+            {"folder_id": target_folder_id},
+        )
+
+    def uncategorize_release(self, instance):
+        """Move a collection item to the "Uncategorized" folder.
+        """
+        self.move_release(instance, 1)
 
     def __repr__(self):
         return '<CollectionFolder {0!r} {1!r}>'.format(self.id, self.name)

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/discogs_client/tests/test_models.py

@@ -1,5 +1,5 @@
 import unittest
-from discogs_client.models import Artist, Release, ListItem, CollectionValue
+from discogs_client.models import Artist, Release, ListItem, CollectionValue, CollectionItemInstance
 from discogs_client.tests import DiscogsClientTestCase
 from discogs_client.exceptions import HTTPError
 
@@ -265,7 +265,6 @@ class ModelsTestCase(DiscogsClientTestCase):
         self.assertEqual(method, 'GET')
         self.assertEqual(url, '/marketplace/listings/150899904')
 
-
     def test_collection(self):
         """Collection folders can be manipulated"""
         # Fetch the users collection folders from the filesystem
@@ -314,6 +313,41 @@ class ModelsTestCase(DiscogsClientTestCase):
         self.assertEqual(method, 'POST')
         self.assertEqual(url, '/users/example/collection/folders/1/releases/1')
 
+    def test_collection_move_release(self):
+        """Collection items can be moved to another folder"""
+        # Fetch the users collection folders from the filesystem
+        u = self.d.user("example")
+        self.assertEqual(u.collection_folders[2].id, 2)
+
+        # Mock expected responses for move_release test using "MemoryFetcher"
+        self.m._fetcher.fetcher.responses = {
+            "/users/example/collection/folders": (b'''
+                {"folders": [
+                    {"resource_url": "/users/example/collection/folders/0", "id": 0, "name": "All"},
+                    {"resource_url": "/users/example/collection/folders/1", "id": 1, "name": "Uncategorized folder"},
+                    {"resource_url": "/users/example/collection/folders/2", "id": 2, "name": "Collection folder 2"}
+                ]}
+            ''', 200),
+            # Mock the response of the POST request to the instance resource URL
+            "/users/example/collection/folders/1/releases/123456/instances/123": (b"", 204),
+        }
+
+        # Bind the user to the MemoryFetcher
+        u.client = self.m
+
+        # Mock a collection item instance
+        instance = CollectionItemInstance(
+            client=u.client,
+            dict_={"id": 123456, "instance_id": 123}
+        )
+        # Perform the move
+        u.collection_folders[1].move_release(instance, 2)
+
+        # Verify
+        method, url, _, _ = self.m._fetcher.last_request
+        self.assertEqual(method, "POST")
+        self.assertEqual(url, "/users/example/collection/folders/1/releases/123456/instances/123")
+
     def test_delete_object(self):
         """Can request DELETE on an APIObject"""
         u = self.d.user('example')

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/discogs_client/utils.py

@@ -1,3 +1,9 @@
+try:
+    from enum import member
+except ImportError:
+    def member(func):
+        return func
+
 from datetime import datetime
 from dateutil.parser import parse
 from urllib.parse import quote
@@ -99,6 +105,7 @@ class Status(Enum):
 
 
 class Sort(Enum):
+    @member
     class By(Enum):
         ADDED = 'added'
         ARTIST = 'artist'
@@ -120,6 +127,7 @@ class Sort(Enum):
         TITLE = 'title'
         YEAR = 'year'
 
+    @member
     class Order(Enum):
         ASCENDING = 'asc'
         DESCENDING = 'desc'

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/python3_discogs_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: python3-discogs-client
-Version: 2.7
+Version: 2.8
 Summary: Python API client for Discogs
 Home-page: https://github.com/joalla/discogs_client
 Author: joalla
@@ -14,5 +14,20 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Communications
 Classifier: Topic :: Utilities
 License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: oauthlib
+Requires-Dist: python-dateutil
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: pydata-sphinx-theme; extra == "docs"
+Requires-Dist: myst-parser; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 This is an active fork of the official "Discogs API client for Python", which was deprecated by discogs.com as of June 2020. We think it is a very useful Python module and decided to continue maintaining it. Please visit: https://github.com/joalla/discogs_client for more information.

python3_discogs_client-2.8/python3_discogs_client.egg-info/requires.txt

@@ -0,0 +1,8 @@
+requests
+oauthlib
+python-dateutil
+
+[docs]
+sphinx
+pydata-sphinx-theme
+myst-parser

{python3-discogs-client-2.7 → python3_discogs_client-2.8}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
         name='python3-discogs-client',
-        version='2.7',
+        version='2.8',
         description='Python API client for Discogs',
         long_description='This is an active fork of the official "Discogs API client for Python", which was deprecated by discogs.com as of June 2020. We think it is a very useful Python module and decided to continue maintaining it. Please visit: https://github.com/joalla/discogs_client for more information.',
         url='https://github.com/joalla/discogs_client',
@@ -29,4 +29,11 @@ setup(
         packages=[
             'discogs_client',
             ],
-        )
+       extras_require={
+           "docs": [
+               "sphinx",
+               "pydata-sphinx-theme",
+               "myst-parser",
+           ],
+       }
+)

python3-discogs-client-2.7/python3_discogs_client.egg-info/requires.txt

@@ -1,3 +0,0 @@
-requests
-oauthlib
-python-dateutil