From 9d1689e065ad217385a9f2ba48cd547e516b8fb0 Mon Sep 17 00:00:00 2001
From: Stefan Koegl <stefan@skoegl.net>
Date: Sat, 18 Sep 2010 20:48:00 +0300
Subject: [PATCH] simplify Device creation

---
 mygpo/api/advanced/__init__.py | 4 ++--
 mygpo/api/advanced/auth.py     | 2 +-
 mygpo/api/advanced/episode.py  | 2 +-
 mygpo/api/models/__init__.py   | 4 ++--
 mygpo/api/simple.py            | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mygpo/api/advanced/__init__.py b/mygpo/api/advanced/__init__.py
index 9ba67fc4..89592517 100644
--- a/mygpo/api/advanced/__init__.py
+++ b/mygpo/api/advanced/__init__.py
@@ -71,7 +71,7 @@ def subscriptions(request, username, device_uid):
         return JsonResponse(changes)
 
     elif request.method == 'POST':
-        d, created = Device.objects.get_or_create(user=request.user, uid=device_uid, defaults = {'type': 'other', 'name': 'New Device'})
+        d, created = Device.objects.get_or_create(user=request.user, uid=device_uid)
 
         if d.deleted:
             d.deleted = False
@@ -260,7 +260,7 @@ def update_episodes(user, actions):
             raise Exception('invalid action %s' % action)
 
         if 'device' in e:
-            device, created = Device.objects.get_or_create(user=user, uid=e['device'], defaults={'name': 'Unknown', 'type': 'other'})
+            device, created = Device.objects.get_or_create(user=user, uid=e['device'])
 
             # undelete a previously deleted device
             if device.deleted:
diff --git a/mygpo/api/advanced/auth.py b/mygpo/api/advanced/auth.py
index cc4136f0..814c4093 100644
--- a/mygpo/api/advanced/auth.py
+++ b/mygpo/api/advanced/auth.py
@@ -35,7 +35,7 @@ def login(request, username, device_uid):
     the device is created if it doesn't already exist
     """
 
-    d, created = Device.objects.get_or_create(user=request.user, uid=device_uid, defaults = {'type': 'other', 'name': _('New Device')})
+    d, created = Device.objects.get_or_create(user=request.user, uid=device_uid)
 
     request.session['device'] = device_uid
     request.session.set_expiry(datetime.now()+timedelta(days=365))
diff --git a/mygpo/api/advanced/episode.py b/mygpo/api/advanced/episode.py
index c8ecc070..70e4ee7d 100644
--- a/mygpo/api/advanced/episode.py
+++ b/mygpo/api/advanced/episode.py
@@ -131,7 +131,7 @@ def update_chapters(req, user):
 
     device = None
     if 'device' in req:
-        device, c = Device.objects.get_or_create(user=user, uid=req['device'], defaults = {'type': 'other', 'name': _('New Device')})
+        device, c = Device.objects.get_or_create(user=user, uid=req['device'])
 
     timestamp = dateutil.parser.parse(req['timestamp']) if 'timestamp' in req else datetime.now()
 
diff --git a/mygpo/api/models/__init__.py b/mygpo/api/models/__init__.py
index 36980260..bd50af5d 100644
--- a/mygpo/api/models/__init__.py
+++ b/mygpo/api/models/__init__.py
@@ -378,8 +378,8 @@ class SyncGroup(models.Model):
 class Device(models.Model):
     user = models.ForeignKey(User)
     uid = models.SlugField(max_length=50)
-    name = models.CharField(max_length=100, blank=True)
-    type = models.CharField(max_length=10, choices=DEVICE_TYPES)
+    name = models.CharField(max_length=100, blank=True, default='Default Device')
+    type = models.CharField(max_length=10, choices=DEVICE_TYPES, default='other')
     sync_group = models.ForeignKey(SyncGroup, blank=True, null=True)
     deleted = models.BooleanField(default=False)
     settings = JSONField(default={})
diff --git a/mygpo/api/simple.py b/mygpo/api/simple.py
index b75c9711..5db6e62c 100644
--- a/mygpo/api/simple.py
+++ b/mygpo/api/simple.py
@@ -140,8 +140,7 @@ def parse_subscription(raw_post_data, format):
 
 
 def set_subscriptions(urls, user, device_uid):
-    device, created = Device.objects.get_or_create(user=user, uid=device_uid,
-        defaults = {'type': 'other', 'name': device_uid})
+    device, created = Device.objects.get_or_create(user=user, uid=device_uid)
 
     # undelete a previously deleted device
     if device.deleted:
-- 
2.11.4.GIT