From fdc29212b740e0c456542f1b6f4ebec44d9777bb Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Thu, 10 Nov 2011 14:59:12 +0000
Subject: [PATCH] rename series, canplayvideo, canplayclips

---
 pandora/0xdb.jsonc       | 22 +++++++++++-----------
 pandora/item/managers.py |  9 ++++++---
 pandora/item/models.py   |  4 ++--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/pandora/0xdb.jsonc b/pandora/0xdb.jsonc
index 4a7de30af..5e30eab59 100644
--- a/pandora/0xdb.jsonc
+++ b/pandora/0xdb.jsonc
@@ -137,6 +137,11 @@
             "columnWidth": 60,
             "format": {"type": "duration", "args": [0, "short"]}
         },
+        {
+            "id": "series",
+            "title": "TV Series",
+            "type": "boolean"
+        },
         {
             "id": "writer",
             "title": "Writer",
@@ -458,21 +463,16 @@
             "sortOperator": "+"
         },
         {
-            "id": "canPlayVideo",
+            "id": "canplayvideo",
             "title": "Can Play Video",
             "type": "boolean",
             "value": "capability"
         },
         {
-            "id": "canPlayClips",
+            "id": "canplayclips",
             "title": "Can Play Clips",
             "type": "boolean",
             "value": "capability"
-        },
-        {
-            "id": "isSeries",
-            "title": "TV Series",
-            "type": "boolean"
         }
     ],
     /*
@@ -540,10 +540,10 @@
         {"id": "favorites", "title": "Favorites"},
         {"id": "most_popular", "title": "Most Popular", "query": {}},
         {"id": "recently_viewed", "title": "Recently Viewed", "query": {}},
-        {"id": "1960s", "title": "1960s", "query": {"conditions": [{"key": "year", "value": "196", "operator": "^"}], "operator": "&"}},
-        {"id": "movies_with_full_video", "title": "Movies with Full Video", "query": {"conditions": [{"key": "canPlayVideo", "value": true, "operator": "="}], "operator": "&"}},
-        {"id": "movies_with_clips", "title": "Movies with Clips", "query": {"conditions": [{"key": "canPlayClips", "value": true, "operator": "="}], "operator": "&"}},
-        {"id": "no_tv_series", "title": "No TV Series", "query": {"conditions": [{"key": "isSeries", "value": false, "operator": "="}], "operator": "&"}}
+        {"id": "1960s", "title": "1960s", "query": {"conditions": [{"key": "year", "value": ["1960", "1970"], "operator": "="}], "operator": "&"}},
+        {"id": "movies_with_full_video", "title": "Movies with Full Video", "query": {"conditions": [{"key": "canplayvideo", "value": true, "operator": "="}], "operator": "&"}},
+        {"id": "movies_with_clips", "title": "Movies with Clips", "query": {"conditions": [{"key": "canplayclips", "value": true, "operator": "="}], "operator": "&"}},
+        {"id": "no_tv_series", "title": "No TV Series", "query": {"conditions": [{"key": "series", "value": false, "operator": "="}], "operator": "&"}}
     ],
     "rightsLevel": {"member": 4, "staff": 3, "admin": 2},
     "rightsLevels": [
diff --git a/pandora/item/managers.py b/pandora/item/managers.py
index 1822c1fa9..d719fe44c 100644
--- a/pandora/item/managers.py
+++ b/pandora/item/managers.py
@@ -63,9 +63,12 @@ def parseCondition(condition, user):
         if exclude:
             q = ~q
         return q
-    elif k in ('canPlayVideo', 'canPlayClips'):
+    elif k in ('canplayvideo', 'canplayclips'):
         level = user.is_anonymous() and 'guest' or user.get_profile().get_level()
-        allowed_level = settings.CONFIG['capabilities'][k][level]
+        allowed_level = settings.CONFIG['capabilities'][{
+            'canplayvideo': 'canPlayVideo',
+            'canplayclips': 'canPlayClips'
+        }[k]][level]
         if v:
             q = Q(level__lte=allowed_level)
         else:
@@ -74,7 +77,7 @@ def parseCondition(condition, user):
             q = ~q
         return q
     elif key_type == 'boolean':
-        q = Q(**{'find__key': k, 'find__value': v and '1' or '0'})
+        q = Q(**{'find__key': k, 'find__value': v})
         if exclude:
             q = ~q
         return q
diff --git a/pandora/item/models.py b/pandora/item/models.py
index 46250eaa2..6d7a47f5e 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -514,7 +514,7 @@ class Item(models.Model):
             if value not in ('', None):
                 f, created = ItemFind.objects.get_or_create(item=self, key=key)
                 if isinstance(value, bool):
-                    value = value and '1' or '0'
+                    value = value and 'true' or 'false'
                 if isinstance(value, basestring):
                     value = value.strip()
                 f.value = value
@@ -567,7 +567,7 @@ class Item(models.Model):
                                 self.get('episodeTitle',
                                 self.get('episode',
                                 self.get('seriesTitle')))) != None
-            save('isSeries', isSeries)
+            save('series', isSeries)
 
     def update_sort(self):
         try: