| Commit message (Collapse) | Author | Files | Lines |
|---|
|
The stat struct isn't going to be modified, make it const.
|
|
update_task() already checks if it has got a root path. Extend this
check and in turn remove a check in the inner function updatePath().
|
|
The algorithm in addDirectoryPathToDB() can be simplified further if
it is combined with the function addParentPathToDB(). Since there is
no other caller of addDirectoryPathToDB(), we can do that. This saves
another large stack buffer.
|
|
This recursive function is very dangerous because it allocates a large
buffer on the stack in every iteration. That may be misused to
generate a stack overflow.
|
|
When a directory cannot be updated, there must be something wrong with
it, and the database contains stale data. Remove it.
|
|
The branching looks a bit complicated in addDirectoryPathToDB() -
improve its readability by moving code to a simplified separate
function.
|
|
When the root directory fails to update, its contents are invalid.
Clear it then.
|
|
When a directory failed to update, it was removed from the database,
without freeing all children and songs (memory leak), and without
locking (race condition). Introduce the functions clear_directory()
and delete_directory(), which do both.
|
|
|
|
Use updateInDirectory() instead of addToDirectory(). Eliminate a
duplicate stat() in updateInDirectory() by calling song_file_update()
directly.
|
|
Don't use db_get_directory() and traverse the full path with every
directory being loaded. Just see if the current parent contains the
entry. Everything else would be invalid anyway..
|
|
A manipulated database could trigger an assertion failure, because the
parent didn't match. Do a proper check if the new directory is within
the parent's. This uses FATAL() to bail out, so MPD still dies, but
it doesn't crash.
|
|
Some tiny utilities... wrappers like these may become helpful when we
introduce locking.
|
|
dirvec_find() does not modify the object, thus it should get a const
pointer.
|
|
No idea why it was created in directory.h, but it should be in
dirvec.h.
|
|
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.
|
|
Use sizeof(buffer) instead.
|
|
Removed a superfluous closure.
|
|
Commit 0bfe7802 broke update for new files in the root directory,
because music_root->path was an empty string and not NULL. There were
some NULL tests missing. Change them to !isRootDirectory(path)
instead of path!=NULL.
|
|
For the root directory, let's set path to an empty string. This saves
a few checks.
|
|
Also convert directory_get_path() to an inline function, which returns
a constant string.
|
|
Pass const songvec pointers to songvec_find() and songvec_for_each().
[ew: already merged songvec_for_each() cosntification somewhere...]
|
|
CamelCase is ugly, rename the functions.
[ew: "directory_get_directory" was too confusing, using
"directory_get_subdir" instead (old function was named
"getSubDirectory")]
|
|
Yet another CamelCase removal patch.
|
|
The same can be achieved with directory_print(db_get_directory()).
|
|
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.
|
|
The function isRootDirectory() is tiny and can be converted to an
inline function. Don't allow name==NULL.
|
|
Eliminate duplicated code.
|
|
Instead of returning 0 or -1, return true on success and false on
failure. This seems more natural, and when the C library was
designed, there was no "bool" data type.
[ew:
changing to bool semantics but sticking with integer type
since bool is C99 and I don't require a C99 compiler,
and I don't feel like writing compatibility wrappers to
support it. _Bool is usually (always?) a signed int
anyways.
]
|
|
This function was never used on remote songs. Replace the runtime
check with an assertion.
|
|
CamelCase is ugly... rename all functions.
|
|
Provide separate constructors for creating a remote song, a local
song, and one for loading data from a song file. This way, we can add
more assertions.
|
|
Check the old status before assigning. This saves a temporary
variable.
|
|
Include only headers which are really used.
[ew: this is totally different from Max's branch]
|
|
Again, a data type which can be forward-declared.
[ew:
* used "struct mpd_song" instead to avoid token duplication
(like I did with "struct mpd_tag") as there's no good
abbreviation for "song" and identical tokens on the same
line don't read well
* rewritten using
perl -i -p -e 's/\bSong\b/struct mpd_song/g' src/*.[ch]
since it was too hard to merge
* also, I don't care much for forward declarations
]
|
|
The struct can be forward-declared by other headers, which relaxes the
header dependencies.
|
|
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_is_empty() is a tiny inline function which determine if a
directory has any child objects (sub directories or songs).
|
|
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.
|
|
Having all functions as static (non-inline) functions generates GCC
warnings, and duplicates binary code across several object files.
Most of dirvec's methods are too complex for becoming inline
functions. Move them all to dirvec.c and publish the prototypes in
dirvec.h.
|
|
Somehow I must have missed this in commit 22e40b61.
|
|
The "packed" attribute may have negative side effects on performance.
Remove the "packed" attribute, and increase the size of "song.url" to
a multiple of the machine word size.
|
|
oops :x
|
|
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.
|
|
Get rid of songvec_write so we can enforce proper locking
|
|
Remove unnecessary wrapper function now that we have
song_print_url_x and also return the results directly
since we'll know the song_print_* functions will all
return -1 on error.
|
|
It'll be handy for passing throug songvec_for_each like
song_print_info_x.
|
|
Being consistent with most UNIX functions...
|
|
Only one lock is used for all songvec traversals since
they're rarely changed. Also, minimize lock time and
release it before calling iterator functions since they
may block (updateSongInfo => stat/open/seek/read).
This lock only protects songvecs (and all of them) during
traversals; not the individual song structures themselves.
|
|
traverseAllIn will be modified to take < 0 as errors instead of
non-zero...
|
