Skip to content

Commit

Permalink
Merge pull request #32 from tallerify/develop
Browse files Browse the repository at this point in the history
Checkpoint 2 v2
  • Loading branch information
mastanca authored May 4, 2017
2 parents 43505b0 + 97519ef commit 62d27ba
Show file tree
Hide file tree
Showing 142 changed files with 3,878 additions and 1,059 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
/cmake-build-test/
/build/
/doc/latex/
/music
/music/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ WORKDIR build
RUN $HOME/usr/bin/cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
RUN make

CMD ["./fiuba_taller2_tallerify_app_server"]
CMD ["./fiuba_taller2_tallerify_app_server", "0.0.0.0"]
4 changes: 2 additions & 2 deletions doc/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config:
tags:
config: b4f4b76259434676a5e1fbaf29f24dde
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified doc/.doctrees/doc/rst/controller.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/ping_controller.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/request.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/server.doctree
Binary file not shown.
Binary file modified doc/.doctrees/doc/rst/track.doctree
Binary file not shown.
Binary file added doc/.doctrees/doc/rst/tracks_controller.doctree
Binary file not shown.
Binary file modified doc/.doctrees/environment.pickle
Binary file not shown.
Binary file modified doc/.doctrees/index.doctree
Binary file not shown.
2 changes: 1 addition & 1 deletion doc/_sources/doc/rst/ping_controller.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PingController

.. doxygenclass:: PingController
:project: tallerify_app_server
:members:
:members:
6 changes: 6 additions & 0 deletions doc/_sources/doc/rst/tracks_controller.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TracksController
================

.. doxygenclass:: TracksController
:project: tallerify_app_server
:members:
1 change: 1 addition & 0 deletions doc/_sources/index.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Indices
/doc/rst/json_response
/doc/rst/mongo_dao
/doc/rst/ping_controller
/doc/rst/tracks_controller
/doc/rst/request
/doc/rst/response
/doc/rst/server
Expand Down
3 changes: 2 additions & 1 deletion doc/doc/rst/controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down Expand Up @@ -168,7 +169,7 @@ <h1>Controller<a class="headerlink" href="#controller" title="Permalink to this
<dl class="class">
<dt id="_CPPv210Controller">
<span id="Controller"></span><span class="target" id="tallerify_app_serverclass_controller"></span><em class="property">class </em><code class="descclassname"></code><code class="descname">Controller</code><a class="headerlink" href="#_CPPv210Controller" title="Permalink to this definition"></a><br /></dt>
<dd><p>Subclassed by <a class="reference internal" href="ping_controller.html#tallerify_app_serverclass_ping_controller"><span class="std std-ref">PingController</span></a></p>
<dd><p>Subclassed by <a class="reference internal" href="ping_controller.html#tallerify_app_serverclass_ping_controller"><span class="std std-ref">PingController</span></a>, <a class="reference internal" href="tracks_controller.html#tallerify_app_serverclass_tracks_controller"><span class="std std-ref">TracksController</span></a></p>
<div class="breathe-sectiondef docutils container">
<p class="breathe-sectiondef-title rubric">Public Functions</p>
<dl class="function">
Expand Down
1 change: 1 addition & 0 deletions doc/doc/rst/json_response.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1 current"><a class="current reference internal" href="#">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down
1 change: 1 addition & 0 deletions doc/doc/rst/mongo_dao.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down
5 changes: 3 additions & 2 deletions doc/doc/rst/ping_controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
href="../../genindex.html"/>
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="next" title="Request" href="request.html"/>
<link rel="next" title="TracksController" href="tracks_controller.html"/>
<link rel="prev" title="MongoDao" href="mongo_dao.html"/>


Expand Down Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down Expand Up @@ -212,7 +213,7 @@ <h1>PingController<a class="headerlink" href="#pingcontroller" title="Permalink

<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">

<a href="request.html" class="btn btn-neutral float-right" title="Request" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="tracks_controller.html" class="btn btn-neutral float-right" title="TracksController" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>


<a href="mongo_dao.html" class="btn btn-neutral" title="MongoDao" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
Expand Down
41 changes: 39 additions & 2 deletions doc/doc/rst/request.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<link rel="search" title="Search" href="../../search.html"/>
<link rel="top" title="Tallerify App Server 0.2.0 documentation" href="../../index.html"/>
<link rel="next" title="Response" href="response.html"/>
<link rel="prev" title="PingController" href="ping_controller.html"/>
<link rel="prev" title="TracksController" href="tracks_controller.html"/>


<script src="../../_static/js/modernizr.min.js"></script>
Expand Down Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down Expand Up @@ -233,6 +234,42 @@ <h1>Request<a class="headerlink" href="#request" title="Permalink to this headli
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK7Request12getElementIdEv">
<span id="Request::getElementIdC"></span><span class="target" id="tallerify_app_serverclass_request_1a7f7e7e642947164fab1440d42de239f8"></span>int <code class="descname">getElementId</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK7Request12getElementIdEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>Get request&#8217;s element id <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>element id </dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2N7Request12setElementIdEi">
<span id="Request::setElementId__i"></span><span class="target" id="tallerify_app_serverclass_request_1a6a5a44a249ca50f0be6414b95a48bed9"></span>void <code class="descname">setElementId</code><span class="sig-paren">(</span>int <em>elementId</em><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N7Request12setElementIdEi" title="Permalink to this definition"></a><br /></dt>
<dd><p>Set the request&#8217;s element id <dl class="docutils">
<dt><strong>Parameters</strong></dt>
<dd><ul class="breatheparameterlist first last simple">
<li><code class="docutils literal"><span class="pre">elementId</span></code>: the element id to set </li>
</ul>
</dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2N7Request6setUrlERKNSt6stringE">
<span id="Request::setUrl__ssCR"></span><span class="target" id="tallerify_app_serverclass_request_1ab48497486f7a2f86a5354576d66e3472"></span>void <code class="descname">setUrl</code><span class="sig-paren">(</span><em class="property">const</em> std::string &amp;<em>url</em><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N7Request6setUrlERKNSt6stringE" title="Permalink to this definition"></a><br /></dt>
<dd><p>Set the url of the request <dl class="docutils">
<dt><strong>Parameters</strong></dt>
<dd><ul class="breatheparameterlist first last simple">
<li><code class="docutils literal"><span class="pre">url</span></code>: to set </li>
</ul>
</dd>
</dl>
</p>
</dd></dl>

</div>
</dd></dl>

Expand All @@ -251,7 +288,7 @@ <h1>Request<a class="headerlink" href="#request" title="Permalink to this headli
<a href="response.html" class="btn btn-neutral float-right" title="Response" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a>


<a href="ping_controller.html" class="btn btn-neutral" title="PingController" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
<a href="tracks_controller.html" class="btn btn-neutral" title="TracksController" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>

</div>

Expand Down
1 change: 1 addition & 0 deletions doc/doc/rst/response.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down
6 changes: 4 additions & 2 deletions doc/doc/rst/server.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Server</a></li>
Expand Down Expand Up @@ -171,12 +172,13 @@ <h1>Server<a class="headerlink" href="#server" title="Permalink to this headline
<dd><div class="breathe-sectiondef docutils container">
<p class="breathe-sectiondef-title rubric">Public Functions</p>
<dl class="function">
<dt id="_CPPv2N6Server6ServerEi">
<span id="Server::Server__i"></span><span class="target" id="tallerify_app_serverclass_server_1a495b58bef6f0d4ca6260de206cff6291"></span><code class="descname">Server</code><span class="sig-paren">(</span>int <em>port</em> = 8080<span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N6Server6ServerEi" title="Permalink to this definition"></a><br /></dt>
<dt id="_CPPv2N6Server6ServerEiNSt6stringE">
<span id="Server::Server__i.ss"></span><span class="target" id="tallerify_app_serverclass_server_1a1ec901fc55efaa9be38ab73335a9e677"></span><code class="descname">Server</code><span class="sig-paren">(</span>int <em>port</em> = 8080, std::string <em>ip</em> = &quot;127.0.0.1&quot;<span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N6Server6ServerEiNSt6stringE" title="Permalink to this definition"></a><br /></dt>
<dd><p><a class="reference internal" href="#tallerify_app_serverclass_server"><span class="std std-ref">Server</span></a> constructor <dl class="docutils">
<dt><strong>Parameters</strong></dt>
<dd><ul class="breatheparameterlist first last simple">
<li><code class="docutils literal"><span class="pre">port</span></code>: server port, defaults to 8080 </li>
<li><code class="docutils literal"><span class="pre">ip</span></code>: server local ip, defaults to 127.0.0.1 </li>
</ul>
</dd>
</dl>
Expand Down
46 changes: 45 additions & 1 deletion doc/doc/rst/track.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
<li class="toctree-l1"><a class="reference internal" href="json_response.html">JSONResponse</a></li>
<li class="toctree-l1"><a class="reference internal" href="mongo_dao.html">MongoDao</a></li>
<li class="toctree-l1"><a class="reference internal" href="ping_controller.html">PingController</a></li>
<li class="toctree-l1"><a class="reference internal" href="tracks_controller.html">TracksController</a></li>
<li class="toctree-l1"><a class="reference internal" href="request.html">Request</a></li>
<li class="toctree-l1"><a class="reference internal" href="response.html">Response</a></li>
<li class="toctree-l1"><a class="reference internal" href="server.html">Server</a></li>
Expand Down Expand Up @@ -167,7 +168,50 @@ <h1>Track<a class="headerlink" href="#track" title="Permalink to this headline">
<dl class="class">
<dt id="_CPPv25Track">
<span id="Track"></span><span class="target" id="tallerify_app_serverclass_track"></span><em class="property">class </em><code class="descclassname"></code><code class="descname">Track</code><a class="headerlink" href="#_CPPv25Track" title="Permalink to this definition"></a><br /></dt>
<dd></dd></dl>
<dd><div class="breathe-sectiondef docutils container">
<p class="breathe-sectiondef-title rubric">Public Functions</p>
<dl class="function">
<dt id="_CPPv2N5Track5TrackEiNSt6stringE">
<span id="Track::Track__i.ss"></span><span class="target" id="tallerify_app_serverclass_track_1a92f6322397b174b830e3c127c852d665"></span><code class="descname">Track</code><span class="sig-paren">(</span>int <em>id</em>, std::string <em>fileLocation</em><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N5Track5TrackEiNSt6stringE" title="Permalink to this definition"></a><br /></dt>
<dd><p><a class="reference internal" href="#tallerify_app_serverclass_track"><span class="std std-ref">Track</span></a> constructor <dl class="docutils">
<dt><strong>Parameters</strong></dt>
<dd><ul class="breatheparameterlist first last simple">
<li><code class="docutils literal"><span class="pre">id</span></code>: the id of the track </li>
<li><code class="docutils literal"><span class="pre">fileLocation</span></code>: location of the associated file in filesystem </li>
</ul>
</dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2N5TrackD0Ev">
<span id="Track::~Track"></span><span class="target" id="tallerify_app_serverclass_track_1a416e75e66accc8eb9e3fafc3e8555216"></span><code class="descname">~Track</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv2N5TrackD0Ev" title="Permalink to this definition"></a><br /></dt>
<dd><p><a class="reference internal" href="#tallerify_app_serverclass_track"><span class="std std-ref">Track</span></a> destroyer </p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK5Track5getIdEv">
<span id="Track::getIdC"></span><span class="target" id="tallerify_app_serverclass_track_1a496f793279d918ed573fcc1971c2d983"></span>int <code class="descname">getId</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK5Track5getIdEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>id getter <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>track&#8217;s id </dd>
</dl>
</p>
</dd></dl>

<dl class="function">
<dt id="_CPPv2NK5Track15getFileLocationEv">
<span id="Track::getFileLocationC"></span><span class="target" id="tallerify_app_serverclass_track_1ac32b18dbbd331f50775368ad5b27d4f9"></span><em class="property">const</em> std::string &amp;<code class="descname">getFileLocation</code><span class="sig-paren">(</span><span class="sig-paren">)</span> <em class="property">const</em><a class="headerlink" href="#_CPPv2NK5Track15getFileLocationEv" title="Permalink to this definition"></a><br /></dt>
<dd><p>file location getter <dl class="docutils">
<dt><strong>Return</strong></dt>
<dd>file location </dd>
</dl>
</p>
</dd></dl>

</div>
</dd></dl>

</div>

Expand Down
Loading

0 comments on commit 62d27ba

Please sign in to comment.