1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 10:49:37 +02:00
Commit graph

177 commits

Author SHA1 Message Date
Afterster
f7cd0b43be Merge branch 'feature/customMetadata' of https://github.com/Razrael/ampache into Razrael-feature/customMetadata
Conflicts:
	lib/class/core.class.php
	lib/class/song.class.php
	lib/class/update.class.php
	lib/class/vainfo.class.php
	modules/catalog/local/local.catalog.php
	templates/show_edit_song_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song.inc.php
2015-11-17 20:48:10 +01:00
Afterster
5124a5ed4c Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
2015-11-07 08:08:59 +01:00
René Bigler
04d8ce9c11 [BUGFIX] Fixe some code style issues 2015-10-29 23:09:52 +01:00
René Bigler
5f50341dff Merge branch 'develop' into feature/customMetadata 2015-10-29 20:36:49 +01:00
Afterster
bda9389c26 Add rating on XML API 2015-10-16 22:47:01 +02:00
Afterster
848f07adbb Directory from 3.8.1 release parsing 2015-10-13 22:05:53 +02:00
Afterster
1ea28c5e0f Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop 2015-10-12 21:37:39 +02:00
wagnered
92cac3fa73 Added logic to parse regex "\d\d\d" file pattern not previously caught.
Improved parsing of standard(typical) file patterns.
2015-09-30 10:45:22 -07:00
Afterster
9b35f818fd Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop 2015-09-24 07:11:01 +02:00
wagnered
e3adcc5106 Modified regex pattern to minimize conflict between Episode Title and unwanted abbreviations. 2015-09-23 15:05:10 -07:00
Afterster
9be94cc5ca Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop
Conflicts:
	config/ampache.cfg.php.dist
	modules/plugins/Tmdb/Tmdb.plugin.php
	modules/plugins/Tvdb/Tvdb.plugin.php
2015-09-23 22:24:48 +02:00
wagnered
bc5b230c0f Tweaked _parse_filename($filepath) to accomodate complete filename regression tests.
Moved common abbreviations to config file for user management.  Incremented config version.
2015-09-20 19:15:43 -07:00
wagnered
02fadd6590 Added force first letter of each word to upper case (camelcase) in titles, TV show name. 2015-09-17 19:30:37 -07:00
wagnered
227157ab87 Further refinement of TV Show filename parsing. 2015-09-17 18:29:02 -07:00
wagnered
729d97246d Added parsing for intra-title and intra-original-name period and hyphen separator removal.
Added parsing for bracket, parenthesis, and angle-bracket separator removal.
2015-09-17 07:47:14 -07:00
wagnered
aea2b2889d Addressed PR scrutinizer issue. 2015-09-12 19:38:10 -07:00
wagnered
c27b8f82a3 Addressed PR scrutinizer issues. 2015-09-12 19:23:25 -07:00
wagnered
df8fb22f54 Refined Vainfo->_parse_filename($filename) to better parse movie and tv show file names.
Removed Vainfo::parseFilename($filename).
2015-09-12 15:58:14 -07:00
René Bigler
899e12e9c7 Merge branch 'develop' into feature/customMetadata 2015-09-07 21:24:56 +02:00
Afterster
8a1ea90ed4 Add m3u8 playlist import
Use audioscrobbler API v2 for album search
2015-09-06 10:08:36 +02:00
Afterster
8f1ede91c4 Handle id3v2 utf-8 comment 2015-09-05 11:07:00 +02:00
wagnered
ded0fed1bc Modified Tvdb and Tmdb plugins to correctly parse filenames. 2015-09-02 21:12:53 -07:00
Maniac
d5562a0f55 Fixed broken indenting 2015-08-17 07:10:17 +02:00
Maniac
7a997f477b Removed unused assignment 2015-08-13 12:34:56 +02:00
Maniac
8b1f61f7dd Fixed issue with wrong file size written to catalog when using id3v2, which sometimes
contains a wrong size (in comparsion with the real file size)
2015-08-13 11:42:50 +02:00
nioc
1b1549e2c1 Fix code Formatting with php-cs-fixer (indentation and braces)
Change-Id: Ia868dceed4dd087edfe4dd948952dbd69ed4fd4e
Signed-off-by: nioc <nioc@users.noreply.github.com>
2015-08-09 20:25:38 +02:00
nioc
0c72fe4a04 Add rating based on POPM id3 tag
Add function to set song rating based on POPM id3 tag when create or
update catalog (resolve ampache/ampache#919)
If no Ampache user mail matches with the one in POPM mail, use super
user rating (id = -1)

Change-Id: I83b94153655ab21d8dede3cade4fb260459df3c3
Signed-off-by: nioc <nioc@users.noreply.github.com>
2015-08-09 18:27:54 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Afterster
60034e755b Fixed #829: Search by "Comment" is not working 2015-05-01 08:28:30 +02:00
Afterster
d56f328005 Fix code style 2015-04-01 20:11:00 +02:00
SeregaPru
5d09e7dcad Fix: special chars in songs names and tags correct support 2015-03-21 01:37:42 +04:00
Afterster
a7377e562e Remove space from quicktime files release date
Add isset check on album/artist update
2015-02-03 23:31:50 +01:00
Afterster
aa3029ef7b Fix new Scrutinizer issues since scrutinizer tool update 2015-02-01 21:14:14 +01:00
wagnered
e644041304 Added switches in _cleanup_quicktime to clean tvshow, tvshow_season from mp4 files. 2015-01-30 21:04:26 -08:00
wagnered
ae10373753 Added "case 'tv_episode':" to "function _cleanup_quicktime($tags)". 2015-01-29 11:27:39 -08:00
Afterster
5da3ec3ba2 Add unsynced lyrics (with space) tag 2015-01-27 08:33:14 +01:00
Afterster
6d45694f22 Fix unsyncedlyrics flac tag support 2015-01-26 07:17:20 +01:00
Afterster
cd55dda99d Fix disk number and album artist metadata read from quicktime files (fix #684 and fix #685) 2015-01-23 06:45:38 +01:00
Afterster
4f204d2d73 Add checks on album art remove from file
Fix break line in lyrics from file tags (end fix #414)
2015-01-22 22:06:55 +01:00
René Bigler
badd651e7c [FEATURE] #280 Add all tags to vainfo 2015-01-10 00:22:14 +01:00
Afterster
169b719749 Coorect preg_split return check on genre parsing 2015-01-08 23:55:15 +01:00
Afterster
6902452a39 Remove tag delimiter regex post check 2015-01-08 22:58:57 +01:00
René Bigler
d2718887f1 [FEATURE] Change name and description 2015-01-07 23:03:33 +01:00
René Bigler
7d93f7c851 [CLEANUP] Syntax cleanup 2015-01-07 22:51:32 +01:00
René Bigler
99d66eb620 [FEATURE] improve genre tag splitting 2015-01-07 22:42:59 +01:00
Afterster
9e03f6242d Add additional genre delimiters
Update config version to 22
2015-01-06 23:02:32 +01:00
lotan
be531ed93f Added support for additional ID3v2 genre delimiters. 2015-01-06 14:20:51 +01:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
lotan
67f592df2b Omit multiple genre processing as it doesn't work in all cases.
Signed-off-by: lotan <lotan@gmx.de>
2014-12-28 11:18:56 +01:00
lotan
e0cf832523 Parse ID3v2 genres translating IDs into names. 2014-12-14 16:13:45 +01:00