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

206 Commits

Author SHA1 Message Date
cvium
65e6211c03 Remove circular dependency between websocket listeners and manager 2020-11-28 11:21:53 +01:00
cvium
1a0d8aef80 Revert "Removed Lazy implementation." 2020-11-28 09:50:16 +01:00
Greenback
5cd5a7d4ce Removed Lazy implementation. 2020-11-28 00:25:20 +00:00
Joshua M. Boniface
c98c2ab955
Merge branch 'master' into syncplay-enhanced 2020-11-27 09:46:18 -05:00
Patrick Barron
5790db05ba Clean up DeviceManager and don't store capabilities on disk 2020-11-19 09:38:54 -05:00
crobibero
73d2cb1c2a Updated based on review feedback 2020-11-13 18:04:06 -07:00
crobibero
95ebb9a55a Use null coalescing when possible 2020-11-13 11:24:46 -07:00
crobibero
5f52a58e78 Convert NullReferenceException to ResourceNotFoundException 2020-11-13 11:14:44 -07:00
crobibero
7bf320922c Fix nullability errors in Emby.Server.Implementations 2020-11-13 09:41:18 -07:00
Ionut Andrei Oanca
8819a9d478 Add playlist-sync and group-wait to SyncPlay 2020-10-16 12:06:29 +02:00
cvium
3d69bcd190 Fix playbackstart not triggering in the new eventmanager 2020-10-06 08:14:56 +02:00
Bond-009
e011659186
Merge pull request #4210 from nielsvanvelzen/typed-websocket-message 
Use enum for WebSocket message types
 2020-10-05 10:40:52 +02:00
Joshua M. Boniface
67e89dd525 Use nicer count comparitor 2020-10-04 17:00:13 -04:00
Joshua M. Boniface
df177b4752 Revert "Implement better count method" 
This reverts commit 5aa519fd39.
 2020-10-04 15:52:39 -04:00
Joshua M. Boniface
5aa519fd39 Implement better count method 2020-10-04 15:46:57 -04:00
Joshua M. Boniface
8dfa2015d0 Make the count an int for cleanliness 2020-10-04 14:14:42 -04:00
Joshua M. Boniface
d0ec6872f3 Increase count check to 1 
There's another way to disable a user anyways.
 2020-10-04 14:06:20 -04:00
Joshua M. Boniface
6e1d1eed23 Make log entry informational 2020-10-04 13:30:21 -04:00
Joshua M. Boniface
b130af1b0c Remove variables from SecurityException 2020-10-04 13:29:18 -04:00
Joshua M. Boniface
975fca5158 Fix syntax error 2020-10-04 13:19:56 -04:00
Joshua M. Boniface
5a7dda337f Add active session tracking 
Adds a flag for a maximum number of user sessions, as well as an
authentication check to ensure that the user is not above this level.
 2020-10-04 13:02:54 -04:00
Niels van Velzen
72534f9d66 Use SessionMessageType for WebSocket messages 2020-09-27 10:00:20 +02:00
Niels van Velzen
3459655bb4 Use GeneralCommandType enum in GeneralCommand name 2020-09-21 16:56:22 +02:00
Claus Vium
571d0570f5 Kill HttpListenerHost 2020-09-03 11:32:22 +02:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
Patrick Barron
adabb4b842 Use IEventManager in SessionManager 2020-08-15 15:55:31 -04:00
Patrick Barron
ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Matt Montgomery
4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00
Matt Montgomery
a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
Bond_009
01e781035f Fix warnings 2020-07-24 16:37:54 +02:00
Patrick Barron
3cca8db905 Fix log spam from EF Core 2020-07-07 18:20:17 -04:00
crobibero
ef8bec23c4 revert missing session fields 2020-06-24 15:09:15 -06:00
ConfusedPolarBear
e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -05:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops 
Add full stop at end of comments (SA1629)
 2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans
9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
Patrick Barron
42b4f0aa2e Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
 2020-06-13 19:41:05 -04:00
Patrick Barron
d0e2027b05 (Hopefully) fix concurrency exceptions. 2020-06-11 19:45:31 -04:00
ConfusedPolarBear
7d9b552403
Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-06-09 13:28:40 -05:00
ConfusedPolarBear
35ff2be9d7 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-08 14:43:58 -05:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Patrick Barron
06f9cde22f Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
 2020-06-04 16:52:23 -04:00
ConfusedPolarBear
5d281adedd Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 17:42:42 -05:00
Bond_009
4748105dce Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode 2020-05-29 11:28:19 +02:00
Patrick Barron
8ca78f33e9 Fix bug when migrating user db with users that have never logged in. 2020-05-28 14:21:26 -04:00
Patrick Barron
01ce56016a Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
 2020-05-26 20:29:11 -04:00
gion
e42bfc92f3 Fix code issues 2020-05-26 11:37:52 +02:00
Patrick Barron
3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Patrick Barron
aca7e221d8 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
 2020-05-15 17:20:07 -04:00
gion
8c04049a59 Fix some code smells 2020-05-15 20:06:41 +02:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
gion
5c8cbd4087 Fix code issues 2020-05-09 14:34:07 +02:00
gion
8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
gion
6e22e9222b Fix code issues 2020-05-09 12:37:23 +02:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
gion
0b974d09ca Synchronize access to data 2020-04-28 14:12:06 +02:00
gion
083d3272d0 Refactor and other minor changes 2020-04-27 22:39:37 +02:00
gion
aad5058d25 Implement KeepAlive for WebSockets 2020-04-27 22:39:37 +02:00
gion
84d92ba9ce Check that client is playing the right item 
Send date when playback command is emitted
Rename some classes
 2020-04-27 22:39:20 +02:00
gion
10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +02:00
ConfusedPolarBear
36f3e933a2 Add quick connect 2020-04-15 14:49:20 -05:00
Mark Monteiro
53380689ad Return correct status codes for authentication and authorization errors 
- Use AuthenticatonException to return 401
- Use SecurityException to return 403
- Update existing throws to throw the correct exception for the circumstance
 2020-04-13 13:17:46 -04:00
Joshua M. Boniface
c356266419 Revert #2146 ordering change 2020-03-29 16:57:13 -04:00
Bond-009
0f173e1778
Merge branch 'master' into sessionmanager 2020-02-19 21:07:09 +01:00
Anthony Lavado
00073c162a
Merge pull request #2363 from dkanada/view 
Add session view endpoint
 2020-02-11 23:56:47 -05:00
Bond-009
cefac4f886
Update Emby.Server.Implementations/Session/SessionManager.cs 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-02-06 13:16:22 +01:00
Bond-009
0a43814596
Merge branch 'master' into sessionmanager 2020-02-06 13:04:07 +01:00
Bond-009
3fe84c3213
Apply suggestions from code review 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-02-06 13:03:02 +01:00
dkanada
f93edb7ade add code suggestions 2020-02-04 01:29:18 +09:00
dkanada
1bc8ca2542 add session view endpoint 2020-02-02 00:16:11 +09:00
dkanada
26dd67a441 change authentication flow 2020-02-02 00:09:18 +09:00
dkanada
6341d986a9 fix a few warnings 2020-02-02 00:07:46 +09:00
dkanada
7df6f8d54e
update error message 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-02-01 23:14:27 +09:00
dkanada
afe9ed977b improve scan progress and fix a few bugs 2020-02-01 22:44:27 +09:00
Bond-009
70bc03c795
Apply suggestions from code review 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2020-02-01 12:54:48 +01:00
Bond_009
c601def484 Fix warnings in SessionManager 2020-01-17 00:19:58 +01:00
Bond_009
407f54e776 Style fixes 2020-01-13 20:06:08 +01:00
Bond-009
4d311870d2 Fix websocket handling 2020-01-13 20:06:08 +01:00
Bond_009
5ca68f9623 Fix nullref exception and added logging 2020-01-13 20:06:08 +01:00
Bond_009
976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond-009
b8c61a5c40
Merge pull request #2146 from cromefire/patch-1 
Fix invalid username handling
 2019-12-15 10:07:22 +01:00
dkanada
02928128b9 track progress for any item that supports the feature 2019-12-14 11:36:06 +09:00
Cromefire_
7e987b9642
Remove whitespace 
Co-Authored-By: Claus Vium <cvium@users.noreply.github.com>
 2019-12-13 15:30:08 +01:00
Cromefire_
6231fc18ea
Fixed invalid username handling 2019-12-13 15:27:12 +01:00
Bond-009
a2c35e6dba Merge remote-tracking branch 'upstream/master' into random 2019-12-06 12:06:13 +01:00
Vasily
5263aaa026
Merge pull request #1503 from cvium/webapi_v2 
Move StartupWizard to ASP.NET Web Api
 2019-11-27 11:50:06 +03:00
Claus Vium
27e3cf1558 Move appbuilder and service collection to Jellyfin.Server 2019-11-24 15:27:58 +01:00
dkanada
51cdc6ea16
Merge pull request #1926 from Bond-009/auth 
Add clearer exceptions, warnings and docs
 2019-11-23 01:14:32 +09:00
Bond-009
b477b3874e Fix some warnings 2019-11-22 16:15:31 +01:00
Bond_009
fef35d0505 Add clearer exceptions, warnings and docs 2019-10-20 21:12:03 +02:00
Bond_009
bbc0875387 Don't shuffle some types by default 2019-10-20 16:08:40 +02:00
Bond_009
8d3b5c851d Improvements to UserManager 2019-08-16 21:06:11 +02:00
Bond_009
52c1b45feb Fix build 2019-08-09 23:17:54 +02:00
Bond-009
6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00
Anthony Lavado
b25c08e79a
Merge pull request #1156 from Bond-009/sep 
Small cleanups here and there
 2019-06-13 22:27:00 -04:00
Bond_009
b69b19ddce Move messageId out of outer loop 2019-03-27 16:28:52 +01:00
Bond_009
6c0e2e249d Even more duplicate code removed 2019-03-27 16:13:36 +01:00