anna/ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
3,420 Commits 9 Branches 131 Tags 139 MiB
f3360f6da5
Commit Graph

169 Commits

Author SHA1 Message Date
Anna Schumaker
1bef380ba7 core/database: Introduce the dbe_key() database operation 
And store the result in the db_entry struct for use later.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
f51852f62e core/database: Introduce the dbe_write() database operation 
For writing database entries to disk.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
2da33f1c75 core/database: Introduce the dbe_read() database operation 
This function allocates and returns a new database entry using
information read from a file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
c77ca65630 core/database: Introduce the dbe_setup() database operation 
Track tags need to add themselves to the filter index and update the
library track count once added to the database.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
c8021639ba core/database: Introduce the dbe_free() database operation 
The Track tag needs to do some cleanup when removed from a database, so
we need to use this op when removing items.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
049156a523 core/database: Introduce the dbe_alloc() database operation 
For allocating new database items from a given key.  Tracks do not need
this function since we have special handling for creation and insertion.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
ab1572ed34 core/database: Add operations vector 
I intend to replace C++ inheritance with this struct of function
pointers.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
1c0235c8c7 core/tags/generic: Remove Generic tag 
Nothing uses it anymore, so it can be safely removed :)

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
cfd501c5d6 core/tags/track: Rewrite unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:47:22 -05:00
Anna Schumaker
92806c5201 core/tags/track: Clean up constructors 
I replace the standard and copy constructors with one that tags a track
during construction.  This lets me clean up a lot of code, and keep
tagging functions internal to the track class.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
33e20989fa core/tags/track: Directly inherit from DatabaseEntry 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
ee71786c09 core/tags/track: Move track_last_play() out of the track struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
90cdfd4cbd core/tags/track: Move track_path() out of the track struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
c634f5d5e2 core/tags/track: Move track_played() out of the track struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
24d5c37a6c core/tags/track: Remove variable accessor functions 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
9c1cbbf8cb core/tags/track: Remove tag accessor functions 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
192bdc3ac7 core/tags/track: Replace tags :: track_size() with track_db_get() 
We want to loop over the track database in several places, so let's make
this easier by just returning the database itself.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
eea0f57cf8 core/tags/track: Move track_commit_db() out of tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
d0ec3e2cac core/tags/track: Move track_remove_all() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
7ffaf91617 core/tags/track: Move track_remove() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
83a945d3da core/tags/track: Move track_add() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
c8061e2868 core/tags/track: Move track_get() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
765079df94 core/tags/track: Convert Track class into a struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
446f1228cf core/tags/library: Add library_file() function 
To help with finding the full path of files that are located in the
library's directory.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
24504c7de8 core/tags/library: Remove library size() and {inc|dec}_size() functions 
We can just access this variable directly instead.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
ac2b4ad52c core/tags/library: Remove library enabled() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
47ab4c4b17 core/tags/library: Move library_set_enabled() out of the library struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
f41235e5b2 core/tags/library: Replace tags :: library_size() with library_db_get() 
It's easier to just pass off the library database rather than forcing
higher layers to iterate over the entire thing (including possible
invalid entries).

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
768f86e802 core/tags/library: Move library_db_init() out of the tags namespace 
And add the function library_db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
d7cff5faf4 core/tags/library: Move library_remove() out of tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
a288922b65 core/tags/library: Move library_find() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
e1093f7eab core/tags/library: Move library_get() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
ffa5e65ba7 core/tags/library: Convert Library class to a struct 
I also have to replace the "library" namespace with the "collection"
namespace to avoid naming collisions.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
dbd4475815 core/tags/library: Rewrite unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
cc3becd566 core/tags/genre: Directly inherit from DatabaseEntry 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
8aa05ecedc core/tags/genre: Move genre_db_init() out of the tags namespace 
And add the function genre_db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
9522da88d0 core/tags/genre: Move genre_find() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
c611eb306d core/tags/genre: Move genre_get() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
5e59166dab core/tags/genre: Convert Genre class to a struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
4cba24e72a core/tags/genre: Rewrite unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
fe3d7867d1 core/tags/artist: Directly inherit from DatabaseEntry 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
405ff0cf88 core/tags/artist: Move artist_db_init() out of the tags namespace 
And add the function artist_db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
52886c926e core/tags/artist: Move artist_find() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
81518dce47 core/tags/artist: Move artist_get() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
2c5c0aa7e0 core/tags/artist: Convert Artist class to a struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
5c56d53f9f core/tags/artist: Rewrite unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
928c215494 core/tags/album: Clean up constructors 
Remove an unused constructor and share code between everything left.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
e5b0047812 core/tags/album: Directly inherit from DatabaseEntry 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
a7746cf901 core/tags/album: Remove album::year() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
abe12bac64 core/tags/album: Move album_db_init() out of the tags namespace 
And add the function album_db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
0fa2d8acc2 core/tags/album: Move album_find() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
1f5668bd72 core/tags/album: Move album_get() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
e6bdf65606 core/tags/album: Convert Album class to a struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
75d4bd2af3 core/tags/album: Rewrite unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
45207ebd2e core/index: Replace index_entry iterators with struct set_iter 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
7dcfc2ba78 core/index: Move index_init() out of the Index class 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
2c5b14c7f3 core/database: Replace database constructor and destructor 
Use db_init() and db_deinit() instead.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
8486fc6111 core/database: Move db_load() out of the database struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
3a74cb0aa5 core/database: Move db_actual_size() out of the database struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
1dcbc0c505 core/database: Remove database::size() function 
We can just use the db_size variable directly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
8a4e9fc2bc core/database: Convert class to a struct 
In addition, we lowercase variable names and add a db_ prefix to all
struct members.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
422f6a389f core/tags/track: Clean up date handling unit test 
Most of this isn't needed anymore now that date handling is being tested
elsewhere.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-11-10 10:55:54 -05:00
Anna Schumaker
074339040b core/file: Remove the file struct constructor 
And replace it with the function file_init().  Let's take this chance to
rework parts of the unit test as well.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-09 09:14:34 -04:00
Anna Schumaker
09c7164aee core/file: Move the close() function out of the file struct 
This change also lets me remove the destructor, since code is expected
to call file_close() when IO is complete.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-09 09:14:34 -04:00
Anna Schumaker
c88b796a7a core/file: Move the open() function out of the file struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-09 09:14:08 -04:00
Anna Schumaker
1dcc56c87e core/file: Convert class to a struct 
In addition, we lowercase variable names and add an f_ prefix to all
struct mebers.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 10:39:51 -04:00
Anna Schumaker
ff26171d6f tests/core: Update queue test to the new framework 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 08:26:29 -04:00
Anna Schumaker
9882727c81 tests/core: Update tags/track test to the new framework 2015-10-07 08:26:29 -04:00
Anna Schumaker
cefadba363 tests/core: Update tags/library test to new framework 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 08:26:29 -04:00
Anna Schumaker
a74c52e5cb tests/core: Update tags/genre test to new framework 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 08:26:28 -04:00
Anna Schumaker
0c294d2481 tests/core: Update tags/album unit test to the new framework 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 08:26:28 -04:00
Anna Schumaker
e6f26d036c tests/core: Update tags/artist test to the new framework 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 08:26:28 -04:00
Anna Schumaker
a6d206a003 tests/core: Update tags/generic test to the new framework 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-10-07 08:26:28 -04:00
Anna Schumaker
12260a3de9 string: Add a function for converting seconds to string 
This is used to get a string representation of the number of seconds
passed in.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-27 09:23:14 -05:00
Anna Schumaker
6cfd0d5c51 tests: Rework much of the testing library 
I move the code into a new cpp file, so it is no longer a header-only
library.  I also take the chance to add a for-each function for testing
iterators.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-13 09:35:26 -05:00
Anna Schumaker
3750293ca0 tags: Fix expected years 
Year is no longer 2014.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-02 10:26:52 -05:00
Anna Schumaker
5a31963e30 tests: Tell doxygen to avoid looking at tag tests 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:37:07 -05:00
Anna Schumaker
2394e46fb7 Track: Re-enable filtering 
This has been disabled for some time.  I added a test for adding track
indexes to the filter upon creation, but it doesn't properly test adding
to the filter when reading from disk.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
09bf458d7a Track: Rename functional test to locale test 
This code is really testing date and locale handling, so this patch
renames the function to match what it actually does.  While I'm at it, I
also introduce some cleanups.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
4224d89813 Track: Add a function for finding track_db size 
This returns the actual size of the database, so be careful when using
it!  The intent of this function is to allow some kind of iteration when
loading databases.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
45c83ed2fd Track: Add a function for removing all tracks from a given library 
This function will be called when doing library removals.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
9dfec9934c Track: Add a function for removing specific tracks from the track_db 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
d5fc2a4de0 Track: Add a function for saving the track_db 
The track_db doesn't have autosaving enabled for performance reasons.
This lets us add several tracks to the database between saves, but it
also means we need to provide a commit() function.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
83cc81c934 Track: Add a function to look up Track tags by index 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
a30f5ef794 Track: Create an add_track() function 
We return a new Track tag or NULL if we have already tagged this track.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
44aac0dcec Generic: Create a copy constructor 
Track tags need a copy constructor to keep library size accurate, so
create one here.
 2014-12-04 08:31:52 -05:00
Anna Schumaker
4edbd69fa7 Track: Change constructor to take relative paths 
I'm going to need to split this value earlier to do a unique lookup when
inserting, so the constructor can take the relative path to make things
easier.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
cfef5c07a0 Track: Clean up test for reads and writes 
I want to test basic reading and writing before running the functional
test, since the functional test will eventually trigger database
commits.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
2578cdadfe Track: Move read and write code into tags/track.cpp 
Sadly, this patch disables filtering for tracks.  This will be reenabled
sometime soon!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
39cc10bb3e Track: Prefetch artist, album, genre and library tags 
This makes the code a little bit cleaner, since we don't need to keep
doing lookups for each test run.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
b5a529795d Track: Add a function for comparing two dates 
I don't want to expose the date structure outside of the track class, so
I'll provide a comparison function instead.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
a2b3ca1292 Track: Make last played date private 
This patch creates a new structure to track the last played date, which
can be expanded into a class at some future point.  Additionally, I use
strftime() to calculate the current date based on the user's current
locale settings.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
6daa26f0d6 Track: Make filepath private 
I don't want anybody outside of this class changing the value, so it
shouldn't be public.  I also change the primary key to use library index
instead of the full filepath while I'm at it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
cdd20da5c0 Track: Convert length_str into a function 
I don't think this value needs to be stored anywhere in the Track class
since it's fairly easy to calculate.  Let's convert it into a function
for now and reevaluate later!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
2540a6aa7a Track: Use GenericTag's _name and _lowercase fields 
This lets me remove the duplicate title and title_lowercase fields from
the Track tag.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
1fdee864a2 Track: Hide length from the public 
I provide an accessor function to keep this value from ever getting
changed outside of the Track class.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
eb23127f6d Track: Hide the play count from the public 
I provide an accessor function to keep this value from getting changed
outside of this class.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
468a4e79d5 Track: Hide the track number from the public 
I provide an accessor function to keep this value from ever getting
changed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
91f6f54b4e Track: Add a test for the Track destructor 
We want to make sure that the _library size is decremented whenever a
track is removed or destroyed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
2dfa9bf168 Track: Hide the genre tag from the public 
And set it using the new constructor.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00