From 715e324b292830100eecbee1758bf1be9e4772ff Mon Sep 17 00:00:00 2001
From: Slater-Victoroff <slater.r.victoroff@gmail.com>
Date: Wed, 29 May 2013 10:03:30 -0400
Subject: [PATCH] Updated documentation in doc and README and made some small
 edits to bash script for added robustness

Added documenntation to the docs folder and edited the mac bash script in response to tests
---
 AUTHORS                           |   1 +
 README.md                         |   5 +-
 common/djangoapps/search/views.py |  83 +++++++++++++++++++
 dist/edX_Apps-0.1-py2.7.egg       | Bin 0 -> 5321 bytes
 scripts/create_mac_dev_env.sh     | 127 ++++++++++++++++++++++++++++++
 5 files changed, 214 insertions(+), 2 deletions(-)
 create mode 100644 common/djangoapps/search/views.py
 create mode 100644 dist/edX_Apps-0.1-py2.7.egg
 create mode 100644 scripts/create_mac_dev_env.sh

diff --git a/AUTHORS b/AUTHORS
index cdfdd4c2fe..ca6e14b252 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,3 +72,4 @@ Giulio Gratta <giulio@giuliogratta.com>
 David Baumgold <david@davidbaumgold.com>
 Jason Bau <jbau@stanford.edu>
 Frances Botsford <frances@edx.org>
+Slater Victoroff <slater.r.victoroff@gmail.com>
diff --git a/README.md b/README.md
index ed52c21fb2..41a292b8aa 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,9 @@ Installation
 The installation process is a bit messy at the moment. Here's a high-level
 overview of what you should do to get started.
 
-**TLDR:** There is a `scripts/create-dev-env.sh` script that will attempt to set all
-of this up for you. If you're in a hurry, run that script. Otherwise, I suggest
+**TLDR:** There is a `scripts/create-dev-env.sh` script, `scripts/create_mac_dev_env.sh` 
+for mac computer, that will attempt to set all of this up for you. 
+If you're in a hurry, run that script. Otherwise, I suggest
 that you understand what the script is doing, and why, by reading this document.
 
 Directory Hierarchy
diff --git a/common/djangoapps/search/views.py b/common/djangoapps/search/views.py
new file mode 100644
index 0000000000..f15dc9266b
--- /dev/null
+++ b/common/djangoapps/search/views.py
@@ -0,0 +1,83 @@
+from django.http import HttpResponse
+from django.template.loader import get_template
+from django.template import Context
+from django.contrib.auth.models import User
+from django.contrib.staticfiles import finders
+from courseware.courses import get_courses
+from courseware.model_data import ModelDataCache
+from courseware.module_render import get_module_for_descriptor
+
+from courseware.views import registered_for_course
+#import logging
+import lxml
+import re
+import posixpath
+import urllib
+from os import listdir
+from os.path import isfile
+from os.path import join
+
+
+def test(request):
+    user = User.objects.prefetch_related("groups").get(id=request.user.id)
+    request.user = user
+
+    course_list = get_courses(user, request.META.get('HTTP_HOST'))
+
+    all_modules = [get_module(request, user, course) for course in course_list if registered_for_course(course, user)]
+    child_modules = []
+    for module in all_modules:
+        child_modules.extend(module.get_children())
+    bottom_modules = []
+    for module in child_modules:
+        bottom_modules.extend(module.get_children())
+    asset_divs = get_asset_div(convert_to_valid_html(bottom_modules[2].get_html()))
+    strings = [get_transcript_directory(lxml.html.tostring(div)) for div in asset_divs]
+    search_template = get_template('search.html')
+    html = search_template.render(Context({'course_list': strings}))
+    return HttpResponse(html)
+
+
+def get_children(course):
+    """Returns the children of a given course"""
+    attributes = [child.location for child in course._child_instances]
+    return attributes
+
+
+def convert_to_valid_html(html):
+    replacement = {"&lt;": "<", "&gt;": ">", "&#34;": "\"", "&#39;": "'"}
+    for i, j in replacement.iteritems():
+        html = html.replace(i, j)
+    return html
+
+
+def get_asset_div(html_page):
+    return lxml.html.find_class(html_page, "video")
+
+
+def get_module(request, user, course):
+    model_data_cache = ModelDataCache.cache_for_descriptor_descendents(course.id, user, course, depth=2)
+    course_module = get_module_for_descriptor(user, request, course, model_data_cache, course.id)
+    return course_module
+
+
+def get_youtube_code(module_html):
+    youtube_snippet = re.sub(r'(.*?)(1\.0:)(.*?)(,1\.25)(.*)', r'\3', module_html)
+    sliced_youtube_code = youtube_snippet[:youtube_snippet.find('\n')]
+    return sliced_youtube_code
+
+
+def get_transcript_directory(module_html):
+    directory_snippet = re.sub(r'(.*?)(data-caption-asset-path=\")(.*?)(\">.*)', r'\3', module_html)
+    sliced_directory = directory_snippet[:directory_snippet.find('\n')]
+    return resolve_to_absolute_path(sliced_directory)
+
+
+def resolve_to_absolute_path(transcript_directory):
+    normalized_path = posixpath.normpath(urllib.unquote(transcript_directory)).lstrip('/')
+    return all_transcript_files(normalized_path)
+
+
+def all_transcript_files(normalized_path):
+    files = [transcript for transcript in listdir(normalized_path) if isfile(join(normalized_path, transcript))]
+    return files
diff --git a/dist/edX_Apps-0.1-py2.7.egg b/dist/edX_Apps-0.1-py2.7.egg
new file mode 100644
index 0000000000000000000000000000000000000000..c82d7837dd818dfcd6950079840a0c70d75ba91f
GIT binary patch
literal 5321
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

literal 0
HcmV?d00001

diff --git a/scripts/create_mac_dev_env.sh b/scripts/create_mac_dev_env.sh
new file mode 100644
index 0000000000..2e60b6d7a4
--- /dev/null
+++ b/scripts/create_mac_dev_env.sh
@@ -0,0 +1,127 @@
+#!/usr/bin/env bash
+
+BASE=$HOME/edx_all
+PLATFORM_REPO=$BASE/edx-platform
+PYTHON_BIN=/usr/local/bin/python
+PYTHON_SHARE=/usr/local/share/python
+
+#Add python directory to $PATH for this session
+$PATH=$PYTHON_SHARE:$PATH
+
+# Create a directory to store everything
+echo "Creating $BASE directory"
+mkdir -p $BASE
+
+# Install HomeBrew
+echo "Installing HomeBrew"
+ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
+
+#Install git
+echo "Installing Git Version Control"
+brew install git
+
+# Clone the edx-platform repository
+echo "Cloning edx-platform repo"
+cd $BASE
+git clone https://github.com/edx/edx-platform.git
+
+#Set git push defaults to upstream rather than master
+echo "Changing git defaults"
+git config --global push.default upstream
+
+# Install system prereqs
+echo "Installing Mac OS X prereqs"
+BREW_FILE=$PLATFORM_REPO/requirements/system/mac_os_x/brew-formulas.txt
+for pkg in $(cat $BREW_FILE); do
+    grep $pkg <(brew list) &>/dev/null || {
+        echo "Installing $pkg"
+        brew install $pkg
+    }
+done
+
+# Manually Installing Ruby prereqs
+brew install openssl
+
+# Install Ruby virtual environment
+curl -L https://get.rvm.io | bash stable --ruby
+source $HOME/.rvm/scripts/rvm
+rvm install ruby-1.9.3-p374
+rvm use 1.9.3-p374
+rvm rubygems latest
+
+gem install bundler
+bundle install --gemfile $PLATFORM_REPO/Gemfile
+
+# Install Python virtual environment
+echo "Installing Python virtualenv"
+sudo pip install virtualenvwrapper
+export VIRTUALENVWRAPPER_PYTHON=$PYTHON_BIN
+export VIRTUALENV_DISTRIBUTE=true
+source $PYTHON_SHARE/virtualenvwrapper.sh
+mkvirtualenv -a edx-platform --system-site-packages edx-platform
+
+# Install numpy and scipy
+NUMPY_VER="1.6.2"
+SCIPY_VER="0.10.1"
+
+echo "Downloading numpy and scipy"
+curl -sL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz
+curl -sL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz
+tar xf numpy.tar.gz
+tar xf scipy.tar.gz
+rm -f numpy.tar.gz scipy.tar.gz
+echo "Compiling numpy"
+cd "$BASE/numpy-${NUMPY_VER}"
+python setup.py install
+echo "Compiling scipy"
+cd "$BASE/scipy-${SCIPY_VER}"
+python setup.py install
+cd "$BASE"
+rm -rf numpy-${NUMPY_VER} scipy-${SCIPY_VER}
+
+# Activate the new Virtualenv for pip fixes
+VIRTUALENV=$HOME/.virtualenvs/edx-platform/bin
+cd $VIRTUALENV
+source activate
+
+# building correct version of distribute from source
+DISTRIBUTE_VER="0.6.28"
+echo "Building Distribute"
+SITE_PACKAGES=$HOME/.virtualenvs/edx-platform/lib/python2.7/site-packages
+cd $SITE_PACKAGES
+curl -O http://pypi.python.org/packages/source/d/distribute/distribute-${DISTRIBUTE_VER}.tar.gz
+tar -xzvf distribute-${DISTRIBUTE_VER}.tar.gz
+cd distribute-${DISTRIBUTE_VER}
+python setup.py install
+cd ..
+rm distribute-${DISTRIBUTE_VER}.tar.gz
+
+# on mac os x get the latest pip
+pip install -U pip
+# need latest pytz before compiling numpy and scipy
+pip install -U pytz
+pip install -U numpy
+# scipy needs cython
+pip install cython
+# fixes problem with scipy on 10.8
+pip install -e git+https://github.com/scipy/scipy#egg=scipy-dev
+
+# Install prereqs
+echo "Installing prereqs"
+cd $PLATFORM_REPO
+rvm use 1.9.3-p374
+rake install_prereqs
+
+# Final dependecy
+echo "Finishing Touches"
+cd $BASE
+pip install argcomplete
+cd $PLATFORM_REPO
+bundle install
+
+# Make required directories
+cd $BASE
+mkdir data log db
+
+# Finished
+echo "Success!"
\ No newline at end of file