first commit in a while

14 files changed, 52 insertions, 3 deletions

diff --git a/backend/__init__.py b/backend/__init__.py
index e69de29..e69de29 100644..100755
--- a/backend/__init__.py
+++ b/backend/__init__.py
diff --git a/backend/browser.py b/backend/browser.py
index 59304b9..59304b9 100644..100755
--- a/backend/browser.py
+++ b/backend/browser.py
diff --git a/backend/fixtures/initial_data.json b/backend/fixtures/initial_data.json
index 14ee1d6..14ee1d6 100644..100755
--- a/backend/fixtures/initial_data.json
+++ b/backend/fixtures/initial_data.json
diff --git a/backend/models.py b/backend/models.py
index 9aaf706..9aaf706 100644..100755
--- a/backend/models.py
+++ b/backend/models.py
diff --git a/backend/search_indexes.py b/backend/search_indexes.py
new file mode 100755
index 0000000..0ec5737
--- /dev/null
+++ b/backend/search_indexes.py
@@ -0,0 +1,13 @@
+import datetime
+from haystack import indexes
+from backend.models import SJContent
+
+class SJSettingsModelIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+
+    def get_model(self):
+        return SJContent
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects.filter(content_type='video')
+
diff --git a/backend/search_indexes.py.old b/backend/search_indexes.py.old
new file mode 100755
index 0000000..7364e6a
--- /dev/null
+++ b/backend/search_indexes.py.old
@@ -0,0 +1,13 @@
+import datetime
+from haystack import indexes
+from backend.models import SJSettingsModel
+
+class SJSettingsModelIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+
+    def get_model(self):
+        return SJSettingsModel
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects
+
diff --git a/backend/templates/redirect.html b/backend/templates/redirect.html
index d83886c..d83886c 100644..100755
--- a/backend/templates/redirect.html
+++ b/backend/templates/redirect.html
diff --git a/backend/templates/search/indexes/backend/sjcontent_text.txt b/backend/templates/search/indexes/backend/sjcontent_text.txt
new file mode 100755
index 0000000..59b3dcd
--- /dev/null
+++ b/backend/templates/search/indexes/backend/sjcontent_text.txt
@@ -0,0 +1 @@
+{{ object.settings_text }}
diff --git a/backend/templates/search/indexes/backend/sjsettingsmodel_text.txt b/backend/templates/search/indexes/backend/sjsettingsmodel_text.txt
new file mode 100755
index 0000000..59b3dcd
--- /dev/null
+++ b/backend/templates/search/indexes/backend/sjsettingsmodel_text.txt
@@ -0,0 +1 @@
+{{ object.settings_text }}
diff --git a/backend/templates/search/search.html b/backend/templates/search/search.html
new file mode 100755
index 0000000..092f2c9
--- /dev/null
+++ b/backend/templates/search/search.html
@@ -0,0 +1,19 @@
+<h1>Search</h1>
+
+<form method="get" action=".">
+    <label for='id_q'>{{ form.q.label }}</label>
+    {{ form.q }}
+    <input type="submit" value="Search">
+</form>
+
+{% if page.object_list %}
+    <ol>
+        {% for result in page.object_list %}
+            <li>
+               {{ result.object.settings_text }}<a href=''>{{ result.object.content_type }}</a>
+            </li>
+        {% endfor %}
+    </ol>
+{% else %}
+    <p>No results found.</p>
+{% endif %}
diff --git a/backend/templates/stats.html b/backend/templates/stats.html
index dfa2146..dfa2146 100644..100755
--- a/backend/templates/stats.html
+++ b/backend/templates/stats.html
diff --git a/backend/tests.py b/backend/tests.py
index 501deb7..501deb7 100644..100755
--- a/backend/tests.py
+++ b/backend/tests.py
diff --git a/backend/urls.py b/backend/urls.py
index a7f884b..a7f884b 100644..100755
--- a/backend/urls.py
+++ b/backend/urls.py
diff --git a/backend/views.py b/backend/views.py
index 7003f09..acb0369 100644..100755
--- a/backend/views.py
+++ b/backend/views.py
@@ -43,8 +43,10 @@ LASTSEEN_TIMEOUT= 7
 MAX_BG_SIZE = 400 * 1024
 
 HTML_TITLE_RE = re.compile('<title>([^<]+)</title>')
-YT_INFO = "http://gdata.youtube.com/feeds/api/videos/"
-YT_INFO_SUFFIX = "?v=2"
+YT_INFO = "https://www.youtube.com/watch?v="
+YT_INFO_SUFFIX = ""
+#YT_INFO = "http://gdata.youtube.com/feeds/api/videos/"
+#YT_INFO_SUFFIX = "?v=2"
 YT_PREFIX = "http://www.youtube.com/watch?v="
 YT_ID_RE = re.compile('http.*v=([^&]+)&?#?')
 VIMEO_PREFIX = "http://vimeo.com/"
@@ -141,7 +143,7 @@ def videos_response_str(videos):
        s = v.settings
        if s.get('removed', 0):
            continue
-       out = u"VIDEO\t%s\t%s\t%s\t%s\t%s\t%s\t%d\n" % (
+       out = u"VIDEO\t%s\t%s\t%s\t%s\t%s\t%s\t%d\n" % ( 
            str(v.id),
            str(datetime_to_timestamp(v.datetime)),
            str(v.user.id),