yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 18:29:40 +02:00
Code Issues Releases Wiki Activity
3091 commits 4 branches 18 tags 116 MiB
Commit graph

92 commits

Author SHA1 Message Date
Afterster
5eceaf2aea Rename Config class to AmpConfig class to avoid conflict with PEAR (fix #68) 2013-12-13 08:36:23 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Afterster
0461f2218f Add Dropbox catalog 
Fix Google Music streaming
 2013-11-17 16:08:32 +01:00
Afterster
ee93570646 Add Subsonic catalog type 2013-11-16 20:17:38 +01:00
Paul Arthur
31afde9fc0 Drop Dba::escape in vainfo 2013-02-05 11:48:31 -05:00
Paul Arthur
0905271377 Clean up vainfo somewhat 
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.
 2013-02-05 11:42:56 -05:00
Paul Arthur
02286a12b8 Add fallback title to filename metadata source 
If we didn't parse anything out, set it to the filename.
 2013-02-05 01:41:39 -05:00
Paul Arthur
ef4d366060 Cosmetics: death to tabs 
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.
 2013-01-26 03:38:46 -05:00
Paul Arthur
16c3ba34fd Cosmetics: clean up heads in lib/ 2013-01-25 18:38:22 -05:00
Paul Arthur
d772b031a9 Switch from print_r to json_encode in debug output 2012-11-13 18:31:33 -05:00
Paul Arthur
25b77a6c75 Partial fix for ASF tags 
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.
 2012-09-06 12:56:20 -04:00
Paul Arthur
4aa37feccc Fix disk number parsing for ID3v2 
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.
 2012-04-15 03:02:29 -04:00
Paul Arthur
8af2544b27 Refactor getting MBIDs from ID3 tags 
Just grab the info from the TXXX bit, instead of relying on a
correlation between the raw tags and the cooked ones.
 2012-04-12 21:56:27 -04:00
Paul Arthur
ecdb8bc02d Add support for pulling ratings from id3 tags 
Not used by anything yet, but it might work.
 2012-04-12 21:42:44 -04:00
Paul Arthur
1c2de30150 Add support for parsing MBIDs in M4A files 2012-04-11 19:13:32 -04:00
Paul Arthur
91603e9800 Don't throw away data that getID3 has deigned to parse 
Fixes M4A tag parsing, probably other things.
 2012-04-11 18:17:54 -04:00
Paul Arthur
425ecbbb3a Don't run filename patterns through preg_quote twice 
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.
 2012-03-31 20:44:41 -04:00
Paul Arthur
f40866b6d5 Use '$a ?: $b' instead of '$a ? $a : $b' in vainfo 
Now that we require PHP 5.3, we can use the more compact format.
 2012-03-06 12:55:17 -05:00
Paul Arthur
6f0c651075 FS#216 - Cannot add music to catalog with 21 February commit 
The wrong version of this change got pushed, somehow.  Fix parse errors.
 2012-02-21 19:19:19 -05:00
Paul Arthur
e36d29434e vainfo: unset disk if totaldiscs is 1 
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.
 2012-02-20 23:11:48 -05:00
Paul Arthur
a40824a96b Drop unnecessary case branch. 2012-02-20 22:50:41 -05:00
Paul Arthur
5b4628c766 Cosmetics: clean up some cruft in vainfo 2011-11-22 17:03:59 -05:00
Paul Arthur
4aa256cb07 Clean up some PHPDoc crap 
Remove misleading, unvetted, or in some cases just plain wrong data.
Packages and categories weren't being used correctly.  They still
aren't.
 2011-04-04 17:37:10 -04:00
Paul Arthur
fa505d7708 Add support for autodetecting encoding for broken id3v2 tags 
Mostly untested.  Must be enabled in config, so we won't be breaking
people's perfectly valid tags by default.
 2011-02-21 15:13:08 -05:00
Paul Arthur
1817f6098b Partial revert of 678cf4b6aa 
id3v2 encoding detection was removed for a reason: it breaks valid tags,
and id3v2 has proper support for multiple standard multibyte encodings.
 2011-02-21 13:46:43 -05:00
momo-i
60fa5f5846 Merge gitorious.org:~momo-i/ampache/momo-is-ampache 
Conflicts:
	config/ampache.cfg.php.dist
 2011-02-17 13:26:41 +09:00
momo-i
a1fa4d54e2 modified tag broken problems 2011-02-17 13:22:48 +09:00
momo-i
e3d5874b99 some id3tags still broken. 2011-02-17 10:49:08 +09:00
momo-i
e46abf8a80 modified debug_event 2011-02-17 08:47:56 +09:00
momo-i
ee70584ae4 maybe all green! 2011-02-17 08:40:45 +09:00
momo-i
a89b5152ab remove @todo 2011-02-17 08:21:31 +09:00
momo-i
678cf4b6aa try to get id3v2 tag! 2011-02-16 08:36:47 +09:00
momo-i
8b5aadb73b update getid3 version 1.8.2 -> 2.0.0b6 
modified vainfo class (not complete)
 2011-02-08 08:39:47 +09:00
momo-i
115500a3e8 added @todo id3tag broken 
http://ampache.org/bugs/task/158 this is my task.
 2011-02-04 10:18:08 +09:00
momo-i
7ef24e84c6 Updated a few informations of function. 2011-02-03 11:56:48 +09:00
momo-i
5da3caed31 Modified header comment for phpdoc 2011-02-03 10:25:54 +09:00
Paul 'flowerysong' Arthur
4f3d8851cf Break everyone's config by changing metadata gathering. 2010-10-06 16:58:31 +00:00
Paul 'flowerysong' Arthur
7549180515 Some vainfo cleanup. Since id3v2 allows multiple charsets and has a standard 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.
 2010-06-22 21:08:20 +00:00
Paul 'flowerysong' Arthur
4b5756ba9d Miscellaneous cleanup. 2010-06-13 08:11:09 +00:00
Paul 'flowerysong' Arthur
92c2191e36 Fix bin/print_tags so it accurately reflects what Ampache will see; it was 
stomping on 'file' results for some reason.  Also a smidge of cleanup in vainfo.
 2010-05-29 17:47:24 +00:00
Paul 'flowerysong' Arthur
1cb0983ed0 Cosmetics: remove trailing whitespace 2010-03-14 20:14:52 +00:00
Paul 'flowerysong' Arthur
d78c207f76 Cosmetics: use tabs for indentation, tweak some indentation/coding style. 2010-03-14 06:10:27 +00:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
Karl 'vollmerk' Vollmer
f035080a1e Improved filename pattern matching #575 2009-12-08 00:14:32 +00:00
Karl 'vollmerk' Vollmer
777d880a0a sync from trunk 2009-11-14 07:32:51 +00:00
Karl 'vollmerk' Vollmer
dc72729c8f Added multiple id3v2 genre to tag patch from quack23 resolves #564 2009-11-14 04:37:16 +00:00
Karl 'vollmerk' Vollmer
1b35ffb126 sync from 3.5.x branch 2009-08-23 14:20:02 +00:00
momo-i
a0f3195f68 fix empty check for $id3v2['UFID'] 2009-07-03 00:02:37 +00:00
momo-i
6136bb1081 fixed for PHP 5.3.0 deprecate warnings 2009-07-02 22:42:40 +00:00
Karl 'vollmerk' Vollmer
62e7eadcba fix title issue and add some more stuff to the boolean list for preferences 2009-06-02 02:04:59 +00:00