.ackrc

@@ -0,0 +1,105 @@
+--ignore-ack-defaults
+--ignore-directory=is:.bzr
+--ignore-directory=is:.cdv
+--ignore-directory=is:~.dep
+--ignore-directory=is:~.dot
+--ignore-directory=is:~.nib
+--ignore-directory=is:~.plst
+--ignore-directory=is:.git
+--ignore-directory=is:.hg
+--ignore-directory=is:.pc
+--ignore-directory=is:.svn
+--ignore-directory=is:_MTN
+--ignore-directory=is:CVS
+--ignore-directory=is:RCS
+--ignore-directory=is:SCCS
+--ignore-directory=is:_darcs
+--ignore-directory=is:_sgbak
+--ignore-directory=is:autom4te.cache
+--ignore-directory=is:blib
+--ignore-directory=is:_build
+--ignore-directory=is:cover_db
+--ignore-file=ext:bak
+--ignore-file=match:/~$/
+--ignore-file=match:/^#.+#$/
+--ignore-file=match:/[._].*\.swp$/
+--ignore-file=match:/core\.\d+$/
+--ignore-file=match:/[.]min[.]js$/
+--ignore-file=match:/[.]js[.]min$/
+--ignore-file=match:/[.]min[.]css$/
+--ignore-file=match:/[.]css[.]min$/
+--type-add=perl:ext:pl,pm,pod,t
+--type-add=perl:firstlinematch:/^#!.*\bperl/
+--type-add=make:ext:mk
+--type-add=make:ext:mak
+--type-add=make:is:makefile
+--type-add=make:is:Makefile
+--type-add=make:is:GNUmakefile
+--type-add=rake:is:Rakefile
+--type-add=cmake:is:CMakeLists.txt
+--type-add=cmake:ext:cmake
+--type-add=actionscript:ext:as,mxml
+--type-add=ada:ext:ada,adb,ads
+--type-add=asp:ext:asp
+--type-add=aspx:ext:master,ascx,asmx,aspx,svc
+--type-add=asm:ext:asm,s
+--type-add=batch:ext:bat,cmd
+--type-add=cfmx:ext:cfc,cfm,cfml
+--type-add=clojure:ext:clj
+--type-add=cc:ext:c,h,xs
+--type-add=hh:ext:h
+--type-add=cpp:ext:cpp,cc,cxx,m,hpp,hh,h,hxx
+--type-add=csharp:ext:cs
+--type-add=css:ext:css
+--type-add=dart:ext:dart
+--type-add=delphi:ext:pas,int,dfm,nfm,dof,dpk,dproj,groupproj,bdsgroup,bdsproj
+--type-add=elisp:ext:el
+--type-add=erlang:ext:erl,hrl
+--type-add=fortran:ext:f,f77,f90,f95,f03,for,ftn,fpp
+--type-add=go:ext:go
+--type-add=groovy:ext:groovy,gtmpl,gpp,grunit,gradle
+--type-add=haskell:ext:hs,lhs
+--type-add=html:ext:htm,html
+--type-add=java:ext:java,properties
+--type-add=js:ext:js
+--type-add=jsp:ext:jsp,jspx,jhtm,jhtml
+--type-add=lisp:ext:lisp,lsp
+--type-add=lua:ext:lua
+--type-add=objc:ext:m,h
+--type-add=objcpp:ext:mm,h
+--type-add=ocaml:ext:ml,mli
+--type-add=parrot:ext:pir,pasm,pmc,ops,pod,pg,tg
+--type-add=php:ext:php,phpt,php3,php4,php5,phtml
+--type-add=php:firstlinematch:/^#!.*\bphp/
+--type-add=plone:ext:pt,cpt,metadata,cpy,py
+--type-add=python:ext:py
+--type-add=python:firstlinematch:/^#!.*\bpython/
+--type-add=rr:ext:R
+--type-add=ruby:ext:rb,rhtml,rjs,rxml,erb,rake,spec
+--type-add=ruby:is:Rakefile
+--type-add=ruby:firstlinematch:/^#!.*\bruby/
+--type-add=rust:ext:rs
+--type-add=scala:ext:scala
+--type-add=scheme:ext:scm,ss
+--type-add=shell:ext:sh,bash,csh,tcsh,ksh,zsh,fish
+--type-add=shell:firstlinematch:/^#!.*\b(?:ba|t?c|k|z|fi)?sh\b/
+--type-add=smalltalk:ext:st
+--type-add=sql:ext:sql,ctl
+--type-add=tcl:ext:tcl,itcl,itk
+--type-add=tex:ext:tex,cls,sty
+--type-add=tt:ext:tt,tt2,ttml
+--type-add=vb:ext:bas,cls,frm,ctl,vb,resx
+--type-add=verilog:ext:v,vh,sv
+--type-add=vhdl:ext:vhd,vhdl
+--type-add=vim:ext:vim
+--type-add=xml:ext:xml,dtd,xsl,xslt,ent
+--type-add=xml:firstlinematch:/<[?]xml/
+--type-add=yaml:ext:yaml,yml
+
+--ignore-directory=is:.tox
+--ignore-directory=is:__pycache__
+--ignore-directory=is:data
+--ignore-directory=is:src
+--ignore-directory=is:dist
+--ignore-directory=is:build
+--ignore-directory=is:discograph.egg-info

.gitignore

@@ -59,4 +59,6 @@ target/
 # discograph
 tmp/
 src/
-logs/
+logs/
+discograph.cfg
+discograph.conf

DEPLOYMENT_NOTES.md

@@ -0,0 +1,47 @@
+# DEPLOYMENT NOTES
+
+These are specific to the deployment on a CentOS 6.5 VPS at http://discograph.mbrsi.org.
+
+Disco/graph was designed for Python 3.4+ and (currently) makes use of Sqlite3 with FTS4 support compiled in.
+
+These notes outline some of the build commands used during the process of determining the correct deployment in the above-described environment.
+
+## Python
+
+Python 3.4, installed manually in /usr/local/.
+
+Linked against manually installed Sqlite3.
+
+    LD_RUN_PATH=/usr/local/sqlite-3.8.11/lib ./configure \
+        LDFLAGS="-L/usr/local/sqlite-3.8.11/lib -Wl,-rpath /usr/local/lib" \
+        CPPFLAGS="-I/usr/local/sqlite-3.8.11/include" \
+        --prefix=/usr/local \
+        --enable-shared
+
+    LD_RUN_PATH=/usr/local/sqlite-3.8.11/lib make altinstall
+
+## Sqlite
+
+Sqlite 3.8.11, installed manually in /usr/local/sqlite-3.8.11/.
+
+Compiled with FTS3 and FTS4.
+
+## apsw
+
+APSW obviates the need for compiling Sqlite 3.8.11 into Python.
+
+    python setup.py fetch --all build --enable-all-extensions install test
+
+## supervisord
+
+It's crucial to set LD_LIBRARY_PATH in the supervisord configuration:
+
+    [program:discograph]
+    directory = /home/mbrsi/subdomains/discograph
+    command = /home/mbrsi/subdomains/discograph/bin/gunicorn --conf gunicorn.conf discograph:app
+    user = mbrsi
+    autostart = true
+    autorestart = false
+    redirect_stderr = true
+    stdout_logfile = /tmp/discograph.log
+    environment=HOME=/home/mbrsi,LD_LIBRARY_PATH=/usr/local/sqlite-3.8.11/lib:/usr/local/lib,LD_RUN_PATH=/usr/local/sqlite-3.8.11/lib

README.md

@@ -1,3 +1,36 @@
-# discograph
+# disco/graph
 
-Social Graphing for the Discogs Database
+[Disco/graph](http://discograph.mbrsi.org/) - Social Graphing for the Discogs
+Database
+
+## What is this?
+
+Disco/graph is an interactive visualization of the relationships between
+musicians, bands and labels. :notes:
+
+All of Disco/graph's data is derived from the [Discogs](http://www.discogs.com)
+discography database: nearly 4 million artists, 1 million labels, and 7 million
+releases creating a network of nearly 70 million different relationships.
+
+## How do I use this?
+
+Visit the live site at http://discograph.mbrsi.org/.
+
+Type an artist name into the search box and go!
+
+What do all of these symbols mean?
+
+* Small circles represent artists.
+* Large circles represent bands.
+* Solid lines show artist/band and sublabel/parent-label membership.
+* Dashed lines show pseudonyms between artists (*AKA*).
+* Dotted lines show all kinds of other relationships, like "artist X played
+  guitar for artist Y" or "artist P did cover art for label Q".
+
+The graph shows at most 100 entities at a time, so double-click on any circle
+containing a plus-sign to reveal more connections.
+
+As mentioned, the data used is straight from Discogs, so if there are any
+omissions or errors, please add or correct the artist on their website.
+
+![The "Morris Day" Network](/discograph.png)

discograph/.gitignore

@@ -1 +1,3 @@
-discograph.conf
+discograph.conf
+node_modules
+locals.py

discograph/Gruntfile.js

@@ -0,0 +1,61 @@
+module.exports = function(grunt) {
+    grunt.initConfig({
+        pkg: grunt.file.readJSON('package.json'),
+        less: {
+            build: {
+                options: {
+                    //compress: true,
+                    //yuicompress: true,
+                    //optimization: 2
+                },
+                files: {
+                    'static/css/discograph.css': 'source/css/discograph.less'
+                },
+            },
+        },
+        smash: {
+            bundle: {
+                src: 'source/js/index.js',
+                dest: 'static/js/discograph.js',
+            },
+        },
+        jsbeautifier: {
+            files: ['static/js/discograph.js'],
+            options: {
+                braceStyle: 'collapse',
+                breakChainedMethods: true,
+                e4x: false,
+                evalCode: false,
+                indentChar: ' ',
+                indentLevel: 4,
+                indentSize: 2,
+                indentWithTabs: false,
+                jslintHappy: true,
+                keepArrayIndentation: false,
+                keepFunctionIndentation: false,
+                maxPreserveNewlines: 0,
+                preserveNewLines: false,
+                spaceBeforeConditional: true,
+                spaceInParen: true,
+                unescapeStrings: false,
+                wrapLineLength: 79,
+                endWithNewline: true
+            }
+        },
+        watch: {
+            js: {
+                files: ['source/js/**'],
+                tasks: ['smash', 'jsbeautifier'],
+                },
+            css: {
+                files: ['source/css/**'],
+                tasks: ['less'],
+                }
+        }
+    });
+    grunt.loadNpmTasks("grunt-jsbeautifier");
+    grunt.loadNpmTasks('grunt-smash');
+    grunt.loadNpmTasks('grunt-contrib-less');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.registerTask('default', ['smash', 'jsbeautifier', 'less', 'watch']);
+};

discograph/api.py

@@ -11,38 +11,60 @@
 blueprint = Blueprint('api', __name__, template_folder='templates')
 
 
-@blueprint.route('/random')
+@blueprint.route('/<entity_type>/relations/<int:entity_id>')
 @decorators.limit(max_requests=60, period=60)
-def route__api__random():
-    role_names = ['Alias', 'Member Of']
-    entity_type, entity_id = helpers.discograph_api.get_random_entity(role_names=role_names)
-    entity_type = {
-        1: 'artist',
-        2: 'label',
-        }[entity_type]
-    data = {'center': '{}-{}'.format(entity_type, entity_id)}
+def route__api__entity_type__relations__entity_id(entity_type, entity_id):
+    if entity_type not in ('artist', 'label'):
+        raise exceptions.APIError(message='Bad Entity Type', status_code=404)
+    data = helpers.get_relations(
+        entity_id,
+        entity_type,
+        )
+    if data is None:
+        raise exceptions.APIError(message='No Data', status_code=400)
     return jsonify(data)
 
 
-@blueprint.route('/artist/network/<int:artist_id>')
+@blueprint.route('/<entity_type>/network/<int:entity_id>')
 @decorators.limit(max_requests=60, period=60)
-def route__api__artist__network__artist_id(artist_id):
+def route__api__entity_type__network__entity_id(entity_type, entity_id):
+    if entity_type not in ('artist', 'label'):
+        raise exceptions.APIError(message='Bad Entity Type', status_code=404)
+    parsed_args = helpers.parse_request_args(request.args)
+    original_roles, original_year = parsed_args
     on_mobile = request.MOBILE
-    data = helpers.discograph_api.get_artist_network(artist_id, on_mobile=on_mobile)
+    data = helpers.get_network(
+        entity_id,
+        entity_type,
+        on_mobile=on_mobile,
+        cache=True,
+        roles=original_roles,
+        )
     if data is None:
-        raise exceptions.APIError()
+        raise exceptions.APIError(message='No Data', status_code=400)
     return jsonify(data)
 
 
 @blueprint.route('/search/<search_string>')
 @decorators.limit(max_requests=120, period=60)
 def route__api__search(search_string):
-    data = helpers.discograph_api.search_entities(search_string)
+    data = helpers.search_entities(search_string)
     return jsonify(data)
 
 
-@blueprint.route('/ping')
-@decorators.limit(max_requests=200, period=60)
-def route__api__ping():
-    print('PING', request.remote_addr)
-    return jsonify({'ping': True})
+@blueprint.route('/random')
+@decorators.limit(max_requests=60, period=60)
+def route__api__random():
+    parsed_args = helpers.parse_request_args(request.args)
+    original_roles, original_year = parsed_args
+    print('Roles:', original_roles)
+    entity_type, entity_id = helpers.get_random_entity(
+        roles=original_roles,
+        )
+    print('    Found: {}-{}'.format(entity_type, entity_id))
+    entity_type = {
+        1: 'artist',
+        2: 'label',
+        }[entity_type]
+    data = {'center': '{}-{}'.format(entity_type, entity_id)}
+    return jsonify(data)