summaryrefslogtreecommitdiffstats
path: root/lib/class/vainfo.class.php
Commit message (Collapse)AuthorAgeFilesLines
* Drop Dba::escape in vainfoPaul Arthur2013-02-051-3/+3
|
* Clean up vainfo somewhatPaul Arthur2013-02-051-528/+233
| | | | | | | | | | | | | | Handling of unknown tags was wrong (we should just pass them through and hope for the best, not do some weird-ass id3v2 thing). Add matroska to the list of known tags. Switch the video types to a generic cleanup function and move the several-times-duplicated general information gathering into the general information gathering function where it belongs. Treat the general information as another tag type instead of special-casing it as a complete override through array_merge. Drop the useless iconv stuff (getID3 already translates tags to our requested charset). Rename some functions to more closely match their purpose. Fix some private functions that were marked public. Fix encoding detection, which has been completely broken for a while.
* Add fallback title to filename metadata sourcePaul Arthur2013-02-051-2/+2
| | | | If we didn't parse anything out, set it to the filename.
* Cosmetics: death to tabsPaul Arthur2013-01-261-1056/+1056
| | | | | The refactoring I've been doing has reminded me of my strong preference for spaces, and I feel inclined to impose my will on the tree.
* Cosmetics: clean up heads in lib/Paul Arthur2013-01-251-8/+2
|
* Switch from print_r to json_encode in debug outputPaul Arthur2012-11-131-1/+1
|
* Partial fix for ASF tagsPaul Arthur2012-09-061-0/+4
| | | | | | Actually transfer all ASF tags into the asf tag array. I suspect that some things like 'genre' may actually be multivalued, but I don't have any samples to back that up.
* Fix disk number parsing for ID3v2Paul Arthur2012-04-151-1/+1
| | | | | | According to the changelog, getID3 1.7.9 standardised on part_of_a_set as the key for this info (pulled from TPOS or TPA, depending on the minor version of ID3v2); we were looking for 'pos', which is wrong.
* Refactor getting MBIDs from ID3 tagsPaul Arthur2012-04-121-6/+8
| | | | | Just grab the info from the TXXX bit, instead of relying on a correlation between the raw tags and the cooked ones.
* Add support for pulling ratings from id3 tagsPaul Arthur2012-04-121-0/+14
| | | | Not used by anything yet, but it might work.
* Add support for parsing MBIDs in M4A filesPaul Arthur2012-04-111-0/+9
|
* Don't throw away data that getID3 has deigned to parsePaul Arthur2012-04-111-19/+0
| | | | Fixes M4A tag parsing, probably other things.
* Don't run filename patterns through preg_quote twicePaul Arthur2012-03-311-15/+22
| | | | | | | | This would result in extra slashes, e.g. '/\/([0-9]+?)\s\\\-\s(.+?)\..+$/' instead of '/\/([0-9]+?)\s\-\s(.+?)\..+$/' There are some unrelated cosmetic changes as well.
* Use '$a ?: $b' instead of '$a ? $a : $b' in vainfoPaul Arthur2012-03-061-95/+31
| | | | Now that we require PHP 5.3, we can use the more compact format.
* FS#216 - Cannot add music to catalog with 21 February commitPaul Arthur2012-02-211-2/+2
| | | | The wrong version of this change got pushed, somehow. Fix parse errors.
* vainfo: unset disk if totaldiscs is 1Paul Arthur2012-02-201-6/+10
| | | | | | | | ID3 should only set disk if it's part of a set, but the same is not true of other metadata sources. Also drop no-op attempted cleanup of disk; we've already run intval, so it won't contain a slash.
* Drop unnecessary case branch.Paul Arthur2012-02-201-3/+0
|
* Cosmetics: clean up some cruft in vainfoPaul Arthur2011-11-221-98/+5
|
* Clean up some PHPDoc crapPaul Arthur2011-04-041-9/+0
| | | | | | Remove misleading, unvetted, or in some cases just plain wrong data. Packages and categories weren't being used correctly. They still aren't.
* Add support for autodetecting encoding for broken id3v2 tagsPaul Arthur2011-02-211-20/+43
| | | | | Mostly untested. Must be enabled in config, so we won't be breaking people's perfectly valid tags by default.
* Partial revert of 678cf4b6aa9d43cf73968a90c49e0a0db2c47fcaPaul Arthur2011-02-211-79/+10
| | | | | id3v2 encoding detection was removed for a reason: it breaks valid tags, and id3v2 has proper support for multiple standard multibyte encodings.
* Merge gitorious.org:~momo-i/ampache/momo-is-ampachemomo-i2011-02-171-0/+1
|\ | | | | | | | | Conflicts: config/ampache.cfg.php.dist
| * modified tag broken problemsmomo-i2011-02-171-1/+1
| |
| * some id3tags still broken.momo-i2011-02-171-0/+1
| |
* | modified debug_eventmomo-i2011-02-171-2/+2
|/
* maybe all green!momo-i2011-02-171-10/+16
|
* remove @todomomo-i2011-02-171-2/+0
|
* try to get id3v2 tag!momo-i2011-02-161-10/+59
|
* update getid3 version 1.8.2 -> 2.0.0b6momo-i2011-02-081-10/+61
| | | | modified vainfo class (not complete)
* added @todo id3tag brokenmomo-i2011-02-041-0/+18
| | | | http://ampache.org/bugs/task/158 this is my task.
* Updated a few informations of function.momo-i2011-02-031-7/+93
|
* Modified header comment for phpdocmomo-i2011-02-031-20/+41
|
* Break everyone's config by changing metadata gathering.Paul 'flowerysong' Arthur2010-10-061-133/+176
|
* Some vainfo cleanup. Since id3v2 allows multiple charsets and has a standard ↵Paul 'flowerysong' Arthur2010-06-221-234/+103
| | | | | | | | way of indicating them, don't try to work around broken id3v2 tags (especially since that breaks valid tags). For id3v1, use a charset detection approach that actually has a chance of working.
* Miscellaneous cleanup.Paul 'flowerysong' Arthur2010-06-131-1/+1
|
* Fix bin/print_tags so it accurately reflects what Ampache will see; it wasPaul 'flowerysong' Arthur2010-05-291-6/+5
| | | | stomping on 'file' results for some reason. Also a smidge of cleanup in vainfo.
* Cosmetics: remove trailing whitespacePaul 'flowerysong' Arthur2010-03-141-241/+241
|
* Cosmetics: use tabs for indentation, tweak some indentation/coding style.Paul 'flowerysong' Arthur2010-03-141-5/+5
|
* Add vim modelines to all php files (Thx ascheel)Karl 'vollmerk' Vollmer2010-03-141-0/+1
|
* Improved filename pattern matching #575Karl 'vollmerk' Vollmer2009-12-081-1/+2
|
* sync from trunkKarl 'vollmerk' Vollmer2009-11-141-4/+37
|
* Added multiple id3v2 genre to tag patch from quack23 resolves #564Karl 'vollmerk' Vollmer2009-11-141-8/+42
|
* sync from 3.5.x branchKarl 'vollmerk' Vollmer2009-08-231-3/+3
|
* fix empty check for $id3v2['UFID']momo-i2009-07-031-10/+12
|
* fixed for PHP 5.3.0 deprecate warningsmomo-i2009-07-021-1/+1
|
* fix title issue and add some more stuff to the boolean list for preferencesKarl 'vollmerk' Vollmer2009-06-021-0/+4
|
* add MBID support Thx flowerysongKarl 'vollmerk' Vollmer2009-06-021-28/+92
|
* tweaked vainfo to accept 1/2 as a valid disk from TPOS also tweaked id3v2 ↵Karl 'vollmerk' Vollmer2009-04-091-0/+4
| | | | tags to include TPOS in the comments array
* fixed default tag encoding to IDO-8859-1momo-i2009-04-061-4/+4
|
* Fixed #424 and applied #423Karl 'vollmerk' Vollmer2009-03-261-84/+173
|