minchoc 0.0.3__tar.gz → 0.0.5__tar.gz

{minchoc-0.0.3 → minchoc-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: minchoc
-Version: 0.0.3
+Version: 0.0.5
 Summary: Short description of project for PyPI etc.
 License: MIT
 Author: Andrew Udvare
@@ -33,3 +33,9 @@ ALLOW_PACKAGE_DELETION = False
 WANT_NUGET_HOME = False
 ```
 
+## Notes
+
+When a user is created, a `NugetUser` is also made. This will contain the API key for pushing.
+
+Only `choco install` and `choco push` are supported.
+

{minchoc-0.0.3 → minchoc-0.0.5}/README.md

@@ -13,3 +13,9 @@ INSTALLED_APPS = ['minchoc']
 ALLOW_PACKAGE_DELETION = False
 WANT_NUGET_HOME = False
 ```
+
+## Notes
+
+When a user is created, a `NugetUser` is also made. This will contain the API key for pushing.
+
+Only `choco install` and `choco push` are supported.

{minchoc-0.0.3 → minchoc-0.0.5}/minchoc/models.py

@@ -10,7 +10,7 @@ import django_stubs_ext
 
 django_stubs_ext.monkeypatch()
 
-__all__ = ('Author', 'Company', 'NugetUser', 'Package', 'PackageVersionDownloadCount')
+__all__ = ('Author', 'Company', 'NugetUser', 'Package')
 
 
 class Company(models.Model):

{minchoc-0.0.3 → minchoc-0.0.5}/minchoc/views.py

@@ -1,4 +1,5 @@
 # pylint: disable=no-member
+from datetime import datetime
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any
@@ -53,7 +54,7 @@ def home(_request: HttpRequest) -> HttpResponse:
 
 
 @require_http_methods(['GET'])
-def metadata(_request: HttpRequest, ending: str = '\n') -> HttpResponse:
+def metadata(_request: HttpRequest) -> HttpResponse:
     return HttpResponse(f'''
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <service xml:base="http://fixme/api/v2/"
@@ -64,7 +65,7 @@ def metadata(_request: HttpRequest, ending: str = '\n') -> HttpResponse:
         <atom:title>Default</atom:title>
         <collection href="Packages"><atom:title>Packages</atom:title></collection>
     </workspace>
-</service>{ending}''',
+</service>\n''',
                         content_type='application/xml')
 
 
@@ -119,17 +120,22 @@ def find_packages_by_id(request: HttpRequest) -> HttpResponse:
     if (sem_ver_level := request.GET.get('semVerLevel')):
         logger.warning(f'Ignoring semVerLevel={sem_ver_level}')
     proto = 'https' if request.is_secure() else 'http'
+    proto_host = f'{proto}://{request.get_host()}'
     try:
-        return HttpResponse('\n'.join(
-            make_entry(f'{proto}://{request.get_host()}', x)
-            for x in Package.objects.filter(nuget_id=request.GET['id'].replace('\'', ''))),
+        content = '\n'.join(
+            make_entry(proto_host, x)
+            for x in Package.objects.filter(nuget_id=request.GET['id'].replace('\'', '')))
+        return HttpResponse(f'{FEED_XML_PRE}{content}{FEED_XML_POST}\n' % {
+            'BASEURL': proto_host,
+            'UPDATED': datetime.now().isoformat()
+        },
                             content_type='application/xml')
     except KeyError:
         return HttpResponse(status=400)
 
 
 @require_http_methods(['GET'])
-def packages(request: HttpRequest, ending: str = '\n') -> HttpResponse:
+def packages(request: HttpRequest) -> HttpResponse:
     filter_ = request.GET.get('$filter')
     order_by = request.GET.get('$orderby') or 'id'
     if (sem_ver_level := request.GET.get('semVerLevel')):
@@ -140,10 +146,14 @@ def packages(request: HttpRequest, ending: str = '\n') -> HttpResponse:
         logger.warning(f'Ignoring $top={top}')
     filters = filter_parser.parse(filter_) if filter_ else {}
     proto = 'https' if request.is_secure() else 'http'
+    proto_host = f'{proto}://{request.get_host()}'
     content = '\n'.join(
-        make_entry(f'{proto}://{request.get_host()}', x)
+        make_entry(proto_host, x)
         for x in Package.objects.order_by(order_by).filter(**filters)[0:20])
-    return HttpResponse(f'{FEED_XML_PRE}\n{content}{FEED_XML_POST}{ending}',
+    return HttpResponse(f'{FEED_XML_PRE}\n{content}{FEED_XML_POST}\n' % {
+        'BASEURL': proto_host,
+        'UPDATED': datetime.now().isoformat()
+    },
                         content_type='application/xml')
 
 
@@ -151,8 +161,12 @@ def packages(request: HttpRequest, ending: str = '\n') -> HttpResponse:
 def packages_with_args(request: HttpRequest, name: str, version: str) -> HttpResponse:
     if (package := Package.objects.filter(nuget_id=name, version=version).first()):
         proto = 'https' if request.is_secure() else 'http'
-        content = make_entry(f'{proto}://{request.get_host()}', package)
-        return HttpResponse(f'{FEED_XML_PRE}\n{content}{FEED_XML_POST}\n',
+        proto_host = f'{proto}://{request.get_host()}'
+        content = make_entry(proto_host, package)
+        return HttpResponse(f'{FEED_XML_PRE}\n{content}{FEED_XML_POST}\n' % {
+            'BASEURL': proto_host,
+            'UPDATED': datetime.now().isoformat()
+        },
                             content_type='application/xml')
     return HttpResponseNotFound()
 
@@ -252,8 +266,6 @@ class APIV2PackageView(View):
             new_package.version3 = int(version_split[3])
         except IndexError:
             pass
-        version_download_count = PackageVersionDownloadCount(count=0, version=new_package.version)
-        version_download_count.save()
         new_package.size = nuget_file.size
         new_package.file = File(nuget_file, nuget_file.name)  # type: ignore[assignment]
         uploader = NugetUser.objects.filter(token=request.headers['x-nuget-apikey']).first()
@@ -265,7 +277,6 @@ class APIV2PackageView(View):
             return HttpResponse(status=400)
         new_package.tags.add(*add_tags)
         new_package.authors.add(*add_authors)
-        new_package.version_download_count.add(version_download_count)
         return HttpResponse(status=201)
 
     def post(self, request: HttpRequest) -> HttpResponse:

{minchoc-0.0.3 → minchoc-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "minchoc"
-version = "0.0.3"
+version = "0.0.5"
 authors = ["Andrew Udvare <audvare@gmail.com>"]
 description = "Short description of project for PyPI etc."
 license = "MIT"