Merge branch 'master' of github.com:seekshreyas/obidroid

* 'master' of github.com:seekshreyas/obidroid:
  Updated Connection file
  Added new mongodb folder and rearranged db folder
  updated changes to wiki

Conflicts:
	.gitignore

.gitignore

@@ -39,5 +39,26 @@ nosetests.xml
 .RData
 .Rhistory
 
+
 ## Vagrant file 
 .vagrant
+
+## OSX files
+# Compiled Python files
+*.pyc
+
+# Folder view configuration files
+.DS_Store
+Desktop.ini
+
+# Thumbnail cache files
+._*
+Thumbs.db
+
+# Files that might appear on external disks
+.Spotlight-V100
+.Trashes
+
+# Ignore the Extras file
+.extra
+

db/mongodb/Connection.txt

@@ -0,0 +1,7 @@
+MONGODB Goods
+
+Login:
+mongo troup.mongohq.com:10005/app18812501 -u username -p password
+
+Load a JSON File:  
+mongoimport --host troup.mongohq.com:10005 --jsonArray --db app18812501 --collection apps_old -u username -p password < json file

db/putAppsReviews.py → db/rdbs/putAppsReviews.py

@@ -7,7 +7,8 @@
 from models.review import Review
 from models.app import App
 
-engine = create_engine('postgresql://postgres:[email protected]:28432/obidroid')
+#engine = create_engine('postgresql://postgres:[email protected]:28432/obidroid')
+engine = create_engine('postgresql://uzwispzaxfcipd:aSkx0cJOSmD2N4tZ2rk4hmJ8EU@ec2-54-204-20-28.compute-1.amazonaws.com:5432/obidroid')
 Base = declarative_base()
 Session = sessionmaker(bind=engine)
 session = Session()
@@ -104,6 +105,43 @@ def parse_all():
     session.commit()
     session.close()
 
+def _processInput(path):
+    """ Process the input directory
+    Process only djvu files that have not been transformed from directory path parameter.
+    """
+
+    # check if passed path is to a directory or to a file
+    if os.path.isfile(path):
+        # extract absolute path from user submitted path value
+        abs_path = os.path.dirname(os.path.abspath(path))
+        filename = os.path.basename(path)
+        processFile(abs_path, filename)
+    elif os.path.isdir(path):
+        # extract absolute path from user submitted path value
+        abs_path = os.path.abspath(path)
+        # loop through and open/transform djvu files
+        for filename in os.listdir(abs_path):
+            processFile(abs_path, filename)
+    else:
+        print "An invalid directory or file was passed as input"
+
+def _getInput():
+    """ Command Line Input Parsing
+        Parse the user input
+    """
+
+    parser = OptionParser()
+    parser.add_option('-i', '--input', dest='filepath', default='.')
+    (option, args) = parser.parse_args()
+
+    if not option.filepath:
+        return parser.error('Input file or directory path not given, use --input="path.to.db.input"')
+
+    return {'src': option.filepath}
+
+def main():
+    userInput - _getInput()
+    processInput
+
 if __name__ == '__main__':
-    #main
-    parse_all()
+    main