anna/ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
851 Commits 9 Branches 131 Tags 139 MiB
4d2558a693
Commit Graph

851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Schumaker
23cd4da304 Track version in libsaria 
Tracking two different versions for Ocarina and libsaria was too much
work.  From now on, Ocarina and libsaria will have the same version.
Ocarina's version string will be set based on libsaria.
 2011-05-01 11:40:09 -04:00
Bryan Schumaker
e537f6d1c6 Added check_deps.py 
This script will attempt to import required and optional dependencies to
see if they are installed and available to the python interpreter.
 2011-05-01 11:39:57 -04:00
Bryan Schumaker
cd914936f3 Bump minor version and mark development as True 2011-05-01 11:39:41 -04:00
Bryan Schumaker
5903d085b2 Current version is 4.3.3 2011-05-01 11:05:55 -04:00
Bryan Schumaker
8ff437a682 web server: Load songs from the library browser 
This patch will load a song clicked on in the original library browser.
This is a better action than trying to play the song through html5!
 2011-05-01 11:05:55 -04:00
Bryan Schumaker
7c4f32c30b ocarina: User cancels manual album art 
This used to cause the album art to change to the Ocarina icon.  When
the user cancels setting album art, None is returned from the selector
function.  We should check for this before trying to set the image and
return early if path is None.
 2011-05-01 11:05:55 -04:00
Bryan Schumaker
50cded315e bump bug version 2011-05-01 11:05:55 -04:00
Bryan Schumaker
44fee8c8b3 web_server: Remove print statements 
These have been commented out in case I need them later.
 2011-05-01 11:05:55 -04:00
Bryan Schumaker
47f33a3f8f libsaria: Don't save on preference initialization 
When a preference is initially created, it should be set to a default
value.  If it is set to a default value, then we don't need to save it
immediately.  Let's wait until it changes before actually doing a
save...
 2011-05-01 11:05:55 -04:00
Bryan Schumaker
802513c726 libsaria: Don't immediately enable preference saving 
We shouldn't need to save preferences during startup because at this
point only the initial values have been set.  If nothing is changed,
then nothing needs to be saved and we can save some time.  This should
also prevent any problems caused by crashing during a save.
 2011-05-01 11:05:55 -04:00
Bryan Schumaker
e812fbaee0 Don't filter when there are no terms 
If there are no terms to filter on, we should return a set of all items.
This will show all songs when a space has been entered into the filter
bar.
 2011-05-01 11:05:54 -04:00
Bryan Schumaker
5f10a01bcb Always clear pause_after 
Always clearing this ensures that we don't keep pausing after playback
is resumed.
 2011-05-01 11:05:54 -04:00
Bryan Schumaker
fc6397dc43 Added Ocarina 4.3 Screenshots 2010-12-30 12:38:43 -05:00
Bryan Schumaker
6201f707cb Mark __dev__ as False 
4.3 is almost done!
 2010-12-30 11:26:20 -05:00
Bryan Schumaker
f6b20e345a Use slash key to grab filter focus 
This may be more natural to people familiar with vim.
 2010-12-29 13:29:27 -05:00
Bryan Schumaker
c17126553f web seeking 
This patch adds the ability to seek forwards or backwards in a song
through the web controls.
 2010-12-27 22:07:24 -05:00
Bryan Schumaker
2eb16793ca Clean up controls.html 
This makes everything easier to read
 2010-12-27 22:06:25 -05:00
Bryan Schumaker
6fc6bb60f6 Set play button status correctly when stopped 
The stop function needs to return True if it is successful.
 2010-12-27 19:09:07 -05:00
Bryan Schumaker
ef5be29197 web: better controls 
I split out the web controls to a new file, and can set the status of
the play button correctly when the page is loaded.  Finally, the
set_play_button() function is called on a timer so changes on the
application will be reflected on the web page eventually.
 2010-12-27 19:00:27 -05:00
Bryan Schumaker
6fd7ea77a2 web: remove return value from send_request 2010-12-27 13:02:07 -05:00
Bryan Schumaker
3c2f4ac147 web: rename do_request to send_request 2010-12-27 13:01:48 -05:00
Bryan Schumaker
f90c387652 web: controls use external utils.js 
Using external javascript makes things easier to read and work with.
 2010-12-27 13:01:00 -05:00
Bryan Schumaker
7455b408e6 web: set_attr_once() 
The set_attr_once() function is the same as set_attr(), only it will
only set the value once.  Attributes like "version" should use this,
since the ocarina version shouldn't change often.
 2010-12-27 12:49:19 -05:00
Bryan Schumaker
66a637815e utils.js: separate attr and id 
I was using the attribute as the object id in the html page.  By
splitting the two, I can have the same attribute set in multiple places
on a single page independently.
 2010-12-27 12:45:23 -05:00
Bryan Schumaker
7c7bf03d71 Set index.html attributes using utils.js 2010-12-27 12:42:22 -05:00
Bryan Schumaker
1b9af74cdc Added utils.js 
The utils.js file is an external javascript file that will make it
easier to set attributes / do controls from more than one page.
 2010-12-27 12:41:33 -05:00
Bryan Schumaker
9dadf082b4 Added uptime to web controls 
Asking for the uptime control will return how long ocarina has been
running.
 2010-12-27 12:40:40 -05:00
Bryan Schumaker
4a34ce51f1 Added uptime() to ocarina package 
Calling this function will return an object representing the total
uptime of Ocarina.
 2010-12-27 12:22:47 -05:00
Bryan Schumaker
bdd9c331e8 Track startup time in ocarina/__init__.py 
The ocarina package can track the startup time better than the launcher
script.  Tracking it in the package will also make startup time
available to other callers.
 2010-12-27 12:19:22 -05:00
Bryan Schumaker
0c636bfd56 Clean up universal_open() 
The cleaned up version chooses what function to call based on file
extention.  I use map.get() to pick a function, and use the open_music()
function as the default.
 2010-12-27 12:06:22 -05:00
Bryan Schumaker
961eacf3c4 Began new library browser 
The new library browser will eventually morph into a web-based clone of
the desktop Ocarina application.
 2010-12-26 22:51:18 -05:00
Bryan Schumaker
805db95d05 add html/images directory 
I thought this was already added?  I guess it wasn't.  Oops...
 2010-12-26 12:29:29 -05:00
Bryan Schumaker
bcdbd3dfc9 Rename web buttons 
The stock_media-* style was too hard to work with.  The buttons have
been renamed in the following way:

stock_media-next.png  -> next.png
stock_media-pause.png -> pause.png
stock_media-play.png  -> play.png
stock_media-next.png  -> next.png
 2010-12-26 12:27:52 -05:00
Bryan Schumaker
759342dc70 Attrs and icons 
- Return improved attributes for artist / album / version
- Remove icons that were recently moved
 2010-12-24 12:42:13 -05:00
Bryan Schumaker
3498c46130 Increase web get_attrs timeout 
Every second was too much!  Do it every 3 seconds instead.
 2010-12-24 12:41:26 -05:00
Bryan Schumaker
5a4aab5869 Change web server devel port 
The development port is now 4243
 2010-12-24 12:33:13 -05:00
Bryan Schumaker
b81ba094fd Added attributes to web page 
The attributes update every second to check for the current song.
 2010-12-24 12:31:55 -05:00
Bryan Schumaker
0b8bc2d7fc Fix choosing random song when playlist is filtered 
I was setting cur_index based on the index into the visible set, rather
than the index into the entire song list.
 2010-12-23 09:53:30 -05:00
Bryan Schumaker
1c4621a79a Set random directly 
This makes much more sense than toggling it.  Toggling caused an
inconsistent state during testing.
 2010-12-23 09:51:09 -05:00
Bryan Schumaker
3802d41b83 Reorder tabs 
This changes the order to Playlist, Queue, Library rather than Playlist,
Library, Queue
 2010-12-23 09:48:39 -05:00
Bryan Schumaker
270d33d5ec Reset playlist before loading xspf file 
Loading an xspf file should replace the current playlist, rather than
add to it.
 2010-12-18 16:45:48 -05:00
Bryan Schumaker
aa0f832356 Refresh the playlist after loading 
After we load an xspf file, we should refresh the playlist to reflect
changes.
 2010-12-18 16:44:18 -05:00
Bryan Schumaker
da99d4b349 Load xspf playlists 
This patch adds loading of xspf playlists
 2010-12-18 16:39:17 -05:00
Bryan Schumaker
77f065b703 Export playlist to xspf 
This patch adds support for saving a playlist as an xspf xml file.  I
only use the <location> tag to keep it simple.
 2010-12-18 16:22:06 -05:00
Bryan Schumaker
da1a5413a4 Library source subdirectory filtering 
When we add a path to the sources list, we should remove all paths that
are a subdirectory of the new path.
 2010-12-18 15:35:51 -05:00
Bryan Schumaker
8d423629be Add fewer library sources 
If we are being asked to add a path that is a subdirectory of a current
library source then we shouldn't add it.
 2010-12-18 15:28:53 -05:00
Bryan Schumaker
66a3344121 Controls pref initialization 
The preferences variable should be initialized earlier to avoid an error
during startup.
 2010-12-18 15:06:18 -05:00
Bryan Schumaker
3c2f40c69e Move backup.py -> export.py, import v1.3 library 
The move was supposed to be in the previous patch ... oops.

This one also adds in importing a v1.3 library xml file.
 2010-12-18 15:03:24 -05:00
Bryan Schumaker
f869b17e2f Rename backup functions 
Backup has been renamed to export
Restore has been renamed to import_xml
 2010-12-18 14:52:31 -05:00
Bryan Schumaker
c08655c1fa More reformatting and comments 2010-12-18 14:49:35 -05:00