michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,423 Commits 2 Branches 79 Tags 73 MiB
c7e7aa0a61
Commit Graph

13423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua M. Boniface
c7e7aa0a61
Merge pull request #1117 from Bond-009/ffmpeg 
Check before flushing ffmpeg log
 2019-03-18 23:59:12 -04:00
Joshua M. Boniface
fc79659549
Merge pull request #1127 from LogicalPhallacy/lockoutfix 
Add configurable user lockout
 2019-03-18 21:13:51 -04:00
Vasily
e81a6adb95
Merge pull request #1090 from redSpoutnik/subtitle-display-title 
Set DisplayTitle for subtitles
 2019-03-17 09:36:35 +03:00
Phallacy
80aedcd7e2 really fixed line endings 2019-03-16 21:36:45 -07:00
Phallacy
fc28c9237c fixed line endings 2019-03-16 21:34:26 -07:00
Phallacy
b04200ca68 adding regex fix 2019-03-16 21:21:14 -07:00
Joshua M. Boniface
67fbbcfd12
Merge pull request #1121 from LogicalPhallacy/master 
Update username regex to string literal with escaped -
 2019-03-17 00:12:15 -04:00
Joshua M. Boniface
e3dbed1c1a
Update Emby.Server.Implementations/Library/UserManager.cs 
Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
 2019-03-16 10:16:23 -07:00
redSpoutnik
480a6607e2
Merge branch 'master' into subtitle-display-title 2019-03-16 17:54:57 +01:00
redSpoutnik
4a30fee40d Remove some dead code 2019-03-16 17:28:45 +01:00
Phallacy
7f0fa74467 updated regex to string literal with escaped - 2019-03-16 00:38:31 -07:00
Vasily
3d1d27230d
Merge pull request #1120 from LogicalPhallacy/master 
quick fix for auth bug
 2019-03-16 10:32:51 +03:00
LogicalPhallacy
9df1506794
Merge pull request #2 from LogicalPhallacy/master 
update lockoutfix to latest for testing
 2019-03-16 00:26:12 -07:00
LogicalPhallacy
2d0844b5db
Merge pull request #1 from jellyfin/master 
merging myself to latest
 2019-03-16 00:25:16 -07:00
Phallacy
1ee016c997 configurable user lockout 2019-03-16 00:18:52 -07:00
Phallacy
221389089c quick fix for auth bug 2019-03-15 21:25:19 -07:00
Joshua M. Boniface
59031ee3b8
Merge pull request #1119 from ploughpuff/503retry 
MusicBrainz 503 Retry Strategy
 2019-03-15 16:47:03 -04:00
PloughPuff
d2e408539e MusicBrainz 503 Retry Strategy 
Upon receiving back a 503 Service Unavailable from MusicBrainz (indicating throttling), retry the same request a number of times before giving up.
 2019-03-15 19:33:26 +00:00
Bond_009
a8140cc74b Merge branch 'master' of github.com:jellyfin/jellyfin into ffmpeg 2019-03-15 18:08:51 +01:00
Bond_009
d5f080fefb Check before flushing ffmpeg log 
The stream could have been diposed while writing.
 2019-03-15 17:58:34 +01:00
Joshua M. Boniface
35ff8ec713
Merge pull request #1116 from Bond-009/sub 
Fix exception caused by #1096
 2019-03-15 12:48:15 -04:00
Bond_009
764c901cd7 Fix exception caused by #1096 
```cs
MediaBrowser.Common.Extensions.ResourceNotFoundException: Configuration
with key subtitles not found.
   at
   Emby.Server.Implementations.AppBase.BaseConfigurationManager.<>c__DisplayClass42_0.<GetConfiguration>b__0(String
   k) in
   /home/pi/dev/jellyfin/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs:line
   247
      at
      System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd(TKey
      key, Func`2 valueFactory)
         at
	 Emby.Server.Implementations.AppBase.BaseConfigurationManager.GetConfiguration(String
	 key) in
	 /home/pi/dev/jellyfin/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs:line
	 238
	    at
	    MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.AddExternalSubtitles(Video
	    video, List`1 currentStreams, MetadataRefreshOptions
	    options, CancellationToken cancellationToken) in
	    /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
	    486
	       at
	       MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.Fetch(Video
	       video, CancellationToken cancellationToken, MediaInfo
	       mediaInfo, BlurayDiscInfo blurayInfo,
	       MetadataRefreshOptions options) in
	       /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
	       204
	          at
		  MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.ProbeVideo[T](T
		  item, MetadataRefreshOptions options,
		  CancellationToken cancellationToken) in
		  /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
		  119
		     at
		     MediaBrowser.Providers.Manager.MetadataService`2.RunCustomProvider(ICustomMetadataProvider`1
		     provider, TItemType item, String logName,
		     MetadataRefreshOptions options, RefreshResult
		     refreshResult, CancellationToken cancellationToken)
		     in
		     /home/pi/dev/jellyfin/MediaBrowser.Providers/Manager/MetadataService.cs:line
		     806

```
 2019-03-15 17:34:15 +01:00
Andrew Rabert
f85d45d17f
Merge pull request #1115 from SuperSandro2000/patch-2 
Clean apt lists in arm Dockerfiles
 2019-03-15 10:53:10 -04:00
Andrew Rabert
022bd1b8b4
Merge pull request #1114 from SuperSandro2000/patch-1 
Only remove /var/lib/apt/lists/* in Dockerfile
 2019-03-15 10:53:00 -04:00
Sandro Jäckel
31305af7ff
Clean apt lists in arm Dockerfiles 2019-03-15 14:39:23 +01:00
Sandro Jäckel
dd929d796f
Only remove /var/lib/apt/lists/* 2019-03-15 14:30:15 +01:00
Vasily
11fde02035
Merge pull request #1105 from ploughpuff/ratelimit 
Only delay making MusicBrainz request if necessary
 2019-03-15 16:01:55 +03:00
Joshua M. Boniface
3d85014edc
Merge pull request #1110 from EraYaN/productname-and-ua 
Adjusted the Product Name so the User Agent is correct/better.
 2019-03-15 00:25:38 -04:00
PloughPuff
d125fbc43d Added contact email to user agent 
MusicBrainz request a contact email address is supplied in comment section of user agent field.
 2019-03-14 21:34:09 +00:00
redSpoutnik
427688a0a0 Change subtitles DisplayTitle behavior 2019-03-14 22:31:51 +01:00
Erwin de Haan
21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Erwin de Haan
ee7bf86e0f Adjusted the Product Name so the User Agent is correct/better. 2019-03-14 22:11:47 +01:00
PloughPuff
f8bb7a7ff4 Increased interval to 1050ms and moved to class scope 
Review comments from JustAMan.
 2019-03-14 19:01:17 +00:00
PloughPuff
6d3e6d800f Only delay making request if necessary 
When requesting data from MusicBrainz, only delay the request if previous request was less than rate limit ago, instead of always delaying for one second at start.
 2019-03-14 19:01:17 +00:00
Vasily
208585d3f6
Merge pull request #1106 from Bond-009/warn2 
More warning fixes
 2019-03-14 19:54:44 +03:00
Vasily
bf00dedc7f
Merge pull request #1103 from Bond-009/stream 
Improvements around streams
 2019-03-14 19:53:50 +03:00
Bond-009
bf43dc00bb More warning fixes 2019-03-13 22:32:52 +01:00
Bond-009
e64aaebbac Improvements around streams 
* Use ArrayPool instead of allocating new buffers each time
* Remove NetworkStream copy
* Remove some dead code
 2019-03-13 21:11:01 +01:00
Erwin de Haan
1d443d2ff5 Do not use the nuget packages for comparison, but the last master build (#1091) 
* Do not use the nuget packages for comparison, but the last master build.
* Only allow passing builds.
 2019-03-13 21:09:08 +01:00
Bond-009
6507a9b2ee
Merge pull request #1104 from EraYaN/disable-abi-check-on-drone 
Disable the Drone CI ABI check
 2019-03-13 20:46:59 +01:00
Erwin de Haan
4cc4d57a78
Disable the Drone CI ABI check 2019-03-13 20:37:08 +01:00
Vasily
605bf0e8c3
Merge pull request #1100 from ploughpuff/rmprobeswitch 
Finalise removal of --ffprobe switch
 2019-03-13 01:42:07 +03:00
Vasily
89e2af6b57
Merge pull request #1096 from dkanada/opensubs 
Remove open subtitles from the server
 2019-03-13 01:22:55 +03:00
PloughPuff
b864e9da2a Finalise removal of --ffprobe switch 
Removed --ffprobe from src files and server/docker scripts.
 2019-03-12 22:09:18 +00:00
Vasily
f10382a696
Merge pull request #1098 from jellyfin/Bond-009-patch-2 
Fix build by removing non existent namespace
 2019-03-13 00:02:24 +03:00
Vasily
297f25cfc2
Merge pull request #1059 from Bond-009/os 
Remove EnvironmentInfo
 2019-03-13 00:01:00 +03:00
Bond-009
afdef163ea
Fix build by removing non existent namespace 
Looks like a wrong auto merge. (We really should fix CI)
 2019-03-12 20:49:29 +01:00
Joshua M. Boniface
6751560228
Merge pull request #1092 from joshuaboniface/configurable-webdir 
Add configurable webdir option
 2019-03-12 12:51:11 -04:00
Joshua M. Boniface
2012eb5e11
Merge pull request #785 from Bond-009/xml 
Remove useless abstraction around XmlReaderSettings
 2019-03-12 11:49:39 -04:00
Bond-009
58068e249a
Merge pull request #1094 from cvium/imageprocessor_exception 
Skip processing of images that don't exist
 2019-03-12 16:40:20 +01:00