aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* path: replaced mpd_basename() with g_path_get_basename()Max Kellermann2008-10-201-1/+2
| | | | | | GLib's g_path_get_basename() is much more reliable than mpd_basename(). The latter could be tricked into an assertion failure.
* directory: added directory_get_name()Max Kellermann2008-10-131-0/+7
| | | | directory_get_name() returns the base name of the directory.
* directory: use mpd_sizeof_str_flex_array for path, tooEric Wong2008-10-131-6/+7
| | | | This way we avoid unnecessary heap allocations.
* directory: added inline wrappers for accessing childrenMax Kellermann2008-10-091-1/+1
| | | | | Some tiny utilities... wrappers like these may become helpful when we introduce locking.
* directory: moved dirvec struct declaration to dirvec.hMax Kellermann2008-10-091-1/+0
| | | | | No idea why it was created in directory.h, but it should be in dirvec.h.
* diretory: moved code to directory_save.c, directory_print.cMax Kellermann2008-10-091-103/+3
| | | | | | Remove clutter from directory.c. Everything which saves or loads to/from the hard disk goes to directory_save.c, and code which sends directory information to the client is moved into directory_print.c.
* directory: path must not be NULLMax Kellermann2008-10-081-7/+7
| | | | | For the root directory, let's set path to an empty string. This saves a few checks.
* directory: eliminate CamelCaseMax Kellermann2008-10-081-23/+23
| | | | CamelCase is ugly, rename the functions.
* database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann2008-10-081-1/+1
| | | | Yet another CamelCase removal patch.
* directory: moved code to database.cMax Kellermann2008-10-081-308/+10
| | | | | | Taming the directory.c monster, part II: move the database management stuff to database. directory.c should only contain code which works on directory objects.
* directory: converted isRootDirectory() to an inline functionMax Kellermann2008-10-081-5/+5
| | | | | The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
* song: removed CamelCaseMax Kellermann2008-10-081-1/+1
| | | | CamelCase is ugly... rename all functions.
* song: converted typedef Song to struct songMax Kellermann2008-10-081-6/+7
| | | | Again, a data type which can be forward-declared.
* directory: converted typedef Directory to struct directoryMax Kellermann2008-10-081-28/+33
| | | | | The struct can be forward-declared by other headers, which relaxes the header dependencies.
* update: merged exploreDirectory() into updateDirectory()Max Kellermann2008-10-081-1/+1
| | | | | | exploreDirectory() duplicates some code in updateDirectory(). Merge both functions, and use directory_is_empty() to determine whether update or explore mode should be used.
* directory: added directory_is_empty()Max Kellermann2008-10-081-1/+1
| | | | | directory_is_empty() is a tiny inline function which determine if a directory has any child objects (sub directories or songs).
* directory: moved code to update.cMax Kellermann2008-10-081-575/+17
| | | | | | The source directory.c mixes several libraries: directory object management, database management and database update, resulting in a 1000+ line monster. Move the whole database update code to update.c.
* directory: fix return value in removeDeletedFromDirectoryEric Wong2008-10-071-1/+1
| | | | oops :x
* directory: serialize song deletes from playlist during updateEric Wong2008-10-071-3/+28
| | | | | | | | | | | | | | | | This makes the update code thread-safe and doesn't penalize the playlist code by complicating it with complicated and error-prone locks (and the associated overhead, not everybody has a thread-implementation as good as NPTL). The update task blocks during the delete; but the update task is a slow task anyways so we can block w/o people caring too much. This was also our only freeSong call site, so remove that function. Note that deleting entire directories is not fully thread-safe, yet; as their traversals are not yet locked.
* directory: use songvec_for_each for iteratorsEric Wong2008-10-071-28/+30
| | | | Get rid of songvec_write so we can enforce proper locking
* dbUtils/directory: traverseAllIn forEachSong returns -1 on errorEric Wong2008-10-071-12/+9
| | | | Being consistent with most UNIX functions...
* Assert if we don't have song or song->url setEric Wong2008-10-071-2/+2
| | | | song objects cannot exist without a path or URL
* song: stop storing song_typeEric Wong2008-10-061-1/+1
| | | | | | | We already know if a song is a URL or not based on whether it has parentDir defined or not. Hopefully one day in the future we can drop HTTP support from MPD entirely when an HTTP filesystem comes along and we can access streams via open(2).
* song: use flex arrays to store song->urlEric Wong2008-10-061-1/+1
| | | | | | Reduce the number of allocations we make, so there's less pressure on the allocator and less overhead to keep track of the allocations in.
* directory: reuse existing directory if found on updateEric Wong2008-10-061-4/+9
| | | | | | | | | Instead of allocating a new one, just reuse an existing one if one is found when rereading the DB. This is a small makes the previous commit work on subdirectories of the root music directory. [1] "song: better handling of existing songs when rereading DB"
* directory: simplify list update handling logicEric Wong2008-10-061-45/+60
| | | | | | | | | | | | | | Now the "update" command can be issued multiple times regardless of whether the client is in list mode or not. We serialize the update tasks to prevent updates from trampling over each other and will spawn another update task once the current one is finished updating and reaped. Right now we cap the queue size to 32 which is probably enough (I bet most people usually run update with no argument anyways); but we can make it grow/shrink dynamically if needed. There'll still be a hard-coded limit to prevent DoS attacks, though.
* directory: streamline deletesEric Wong2008-10-061-17/+15
| | | | | Instead of relying on the shortname, just pass the song pointer to prevent redundant lookups during deletes.
* directory: isRootDirectory() is a one-linerEric Wong2008-09-291-4/+1
| | | | Improving the signal to noise ratio...
* directory: writeDirectoryInfo propagates errorsEric Wong2008-09-291-21/+19
| | | | | If a write failed, it's a good sign subsequent writes will fail, too, so propgate errors all the way up the stack.
* directory: make it clear that DIRECTORY_MTIME is deprecatedEric Wong2008-09-291-1/+1
| | | | A long time ago in an mpd far away...
* directory: remove "Mp3" referencesEric Wong2008-09-291-17/+17
| | | | | MPD has supported more audio formats than just MP3 for over five years...
* directory: remove shortname arguments everywhereEric Wong2008-09-291-80/+41
| | | | | | It was a huge confusing mess of parameter passing around and around. Add a few extra assertions to ensure we're handling parent/child relationships properly.
* directory: replace DirectoryList with dirvecEric Wong2008-09-291-195/+96
| | | | | Small memory reduction compared to songvec since most users have much fewer dirs than songs, but still nice to have.
* directory: remove unused CPP definesEric Wong2008-09-291-4/+0
| | | | We no longer for for updates
* songvec_free => songvec_destroyEric Wong2008-09-291-1/+1
| | | | | "free" implies the songvec structure itself is freed, which is not the case.
* directory.c: kill unnecessary includesEric Wong2008-09-291-4/+1
|
* directory: update playlist version if updatedEric Wong2008-09-291-1/+6
| | | | | | | | | | | | If we updated the mpd metadata database; then there's a chance some of those songs in the playlist will have updated metadata. So be on the safe side and increment the playlist version number if _any_ song changed (this is how all released versions of mpd did it, too). This bug was introduced recently when making "update" threaded. Thanks to stonecrest for the bug report.
* directory: fix leak introduced with threaded updateEric Wong2008-09-231-1/+1
| | | | | Use freeList() instead of free() to free all elements in the list.
* Remove EINTR checking for open(2)Eric Wong2008-09-231-1/+1
| | | | | | open(2) should only interrupt on "slow" devices, afaik... [mk: still using fopen()]
* directory: don't leak file handles if we get a corrupt dbEric Wong2008-09-231-1/+1
|
* directory: update do its work inside a threadEric Wong2008-09-231-106/+50
| | | | | | | | | A lot of the preparation was needed (and done in previous months) in making update thread-safe, but here it is. This was the first thing I made work inside a thread when I started mpd-uclinux many years ago, and also the last thing I've done in mainline mpd to work inside a thread, go figure.
* directory: use enum update_return for return values IIMax Kellermann2008-09-231-16/+21
| | | | Converted some more functions and their callers to enum update_return.
* directory: use enum update_return for return valuesEric Wong2008-09-231-72/+49
| | | | This way we avoid having to document -1, 0, 1
* workaround race condition on updates with broken signal blockingEric Wong2008-09-231-39/+50
| | | | | | | | | pthreads with our existing signal blocking/handling is broken, for now just sleep a bit in the child to prevent the CHLD handler from being called too early. Also, improve error reporting when handling SIGCHLD by storing the status to be called in the main task (which can be logged, since we can't do logging inside the sig handler).
* Replace SongList with struct songvecEric Wong2008-09-231-47/+47
| | | | | | | Our linked-list implementation is wasteful and the SongList isn't modified enough to benefit from being a linked list. So use a more compact array of song pointers which saves ~200K on a library with ~9K songs (on x86-32).
* directory: remove unused updateMp3Directory() functionEric Wong2008-09-231-18/+0
| | | | | | | | | | | | It hasn't been used in many years commit 3a89afdd80f228139554372a83a9d74486acf691 Author: Warren Dukes <warren.dukes@gmail.com> Date: Sat Nov 20 20:28:32 2004 +0000 remove --update-db option (SVN r2719)
* start using prefixcmp()Eric Wong2008-09-231-15/+8
| | | | | LOC reduction and less noise makes things easier for tired old folks to follow.
* Directory: don't allocate stat information dynamicallyEric Wong2008-09-231-44/+19
| | | | | | | This should save a few thousand ops. Not worth it to malloc for such a small (3-words on 32-bit ARM and x86) structures. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* pass "struct client" to dbUtils.c, song.c, tag_print.cMax Kellermann2008-09-071-7/+6
| | | | | | Don't pass the raw file descriptor around. This migration patch is rather large, because all of the sources have inter dependencies - we have to change all of them at the same time.
* directory: don't pass "fd" to updateInit()Max Kellermann2008-09-071-11/+4
| | | | Again, move error handling to command.c.