351560079b
Add concurrent recordings setting to settings tab
2019-02-05 15:25:56 +01:00
097fb251cb
Add getCurrentlyRecording to recorder
...
This method returns the models, which are currently recorded. It is
implemented as default method, so that LocalRecorder and RemoteRecorder
don't have to implement the same logic.
2019-02-05 15:07:56 +01:00
76f4583ebc
Rename Recorder.isRecording to Recorder.isTracked
2019-02-05 14:45:44 +01:00
198a9c6893
Rename Recorder.getModelsRecording to Recorder.getModels
2019-02-05 14:44:21 +01:00
2dd8100a97
Add setting to limit the number of concurrent active recordings
2019-02-05 14:41:31 +01:00
39679f3162
Improve exception handling and logging for the playlist generation
2019-02-05 13:38:09 +01:00
80e577db7c
Add menu entry to regenerate the playlist
2019-01-31 15:07:42 +01:00
6e58dd6be5
Implement follow/unfollow for BongaCams
2019-01-29 16:28:07 +01:00
4f541c0570
Increased version to 1.18.0
2019-01-29 14:25:54 +01:00
e7feaad11c
Merge branch 'dev' into fc2
2019-01-29 13:05:43 +01:00
2fe6ec0e8f
Fix #156
...
Make sure, that the tray icon is created only once. Also move the
notification methods from OS to DesktopIntegration.
2019-01-28 17:26:53 +01:00
9f13a54eb6
Remove misleading log message
2019-01-28 16:20:07 +01:00
8e2abd2f11
Implement createModelFromUrl for FC2Live
2019-01-28 14:44:45 +01:00
626d13f87a
Implement createModelFromUrl
2019-01-28 13:32:42 +01:00
df38ed3027
Sanitize name before creeating a model object
...
Names can contain '/' on FC2Live, which messes with the directory
structure of recordings
2019-01-27 15:18:19 +01:00
ba0c456f19
Reduce log level for FC2Live websocket messages to TRACE
2019-01-27 15:17:30 +01:00
76c5c2e6c6
Remove log message
2019-01-27 14:10:45 +01:00
70a9d65e48
Fix login for FC2Live
...
FC2Live sends cookies with value "deleted" to invalidate previously set values. In the same request
they send new values, too. That confused OkHttp. We now use a custom cookie jar for FC2Live, which
ignores cookies with the value "deleted"
2019-01-27 14:05:45 +01:00
0f51be96c0
Implement FC2Live downloads for the server
2019-01-24 20:24:09 +01:00
16752b892c
Merge branch 'dev' into fc2
...
# Conflicts:
# common/src/main/java/ctbrec/sites/jasmin/LiveJasminHttpClient.java
2019-01-24 19:16:52 +01:00
a91819c2ca
Extend the recording name to include seconds and milliseconds
...
This is necessary, because there are models, who stream on different
sites with the same name as mentioned in #141 . In that case it can
happen that a recording for each site would be started within the same
minute and one recording would overwrite the other.
2019-01-24 19:00:02 +01:00
2c67b0b75c
Merge branch 'jasmin' into dev
2019-01-24 15:52:38 +01:00
aa093c0ec1
Delete all LiveJasmin cookies, if we are guests
2019-01-24 15:47:26 +01:00
0417fd6bfb
Remove guest session cookies on start for LiveJasmin
2019-01-24 15:41:47 +01:00
beeaca4beb
Implement login and follow/unfollow
2019-01-24 15:24:05 +01:00
6bb6637683
Remove guest session cookies on start for LiveJasmin
2019-01-23 18:27:34 +01:00
16fdee2a2c
Merge branch 'dev' into fc2
...
# Conflicts:
# client/src/main/java/ctbrec/ui/ExternalBrowser.java
2019-01-23 17:56:20 +01:00
e8572434a9
Set version to 1.17.1
2019-01-23 17:41:03 +01:00
44bc5d02aa
Add setting to change the base URL for LiveJasmin
...
This setting is for users, which are blocked for the main domain, like
users behind the great chinese wall.
2019-01-23 16:25:02 +01:00
9bfd15b35e
Use a different way to retrieve the master playlist
...
@M1h43ly posted URLs in #153 , which work without being logged in and
even seem to support HD streams much better.
2019-01-23 16:22:36 +01:00
c8ffdbe616
Send heartbeat every now and again
...
The heartbeat has to sent every now and again to keep the stream going.
Otherwise you will get a 403 after a few minutes when trying to access
the playlist.
2019-01-23 14:14:14 +01:00
19afa9ce79
Remove Fc2WebSocketClient
...
This is now handled in Fc2Model
2019-01-23 14:12:01 +01:00
64c82748dc
Count the websocket uses wth AtomicInteger
2019-01-22 22:42:46 +01:00
fc6aeff94a
Implemt special player handling for fc2live
2019-01-21 17:58:59 +01:00
55fc6729f8
Merge branch 'dev' into fc2
...
# Conflicts:
# client/src/main/java/ctbrec/ui/CamrecApplication.java
# client/src/main/java/ctbrec/ui/SiteUiFactory.java
2019-01-20 13:51:04 +01:00
43ef2bdf67
Add setting to disable playlist generation on the server
...
Implementing #142 .
This has feature has the disadvantage, that the recording is always detected as still
recording, because the finished state is assumed by the existence of the playlist file.
2019-01-20 13:35:44 +01:00
11f2a3ef8d
Increase version to 1.17.0
2019-01-19 16:06:50 +01:00
ce839ee222
Implemented tipping for LiveJasmin
...
Add new class, which opens a chat websocket (relay server) and sends a tip message
2019-01-18 18:57:16 +01:00
86f086eb20
Create specialized HLS downloads for server and client
2019-01-18 16:32:47 +01:00
df47f4ba91
Add specialized HLS server download for LiveJasmin
...
The server-side HLS download has to refresh the master playlist URL like
the merged HLS donwload
2019-01-18 16:31:32 +01:00
3e4483aabd
Print out master playlist URL for LiveJasmin
2019-01-17 10:53:37 +01:00
dd2b8041d7
Add some text to explain, that LiveJasmin is not fully functional
2019-01-15 17:10:56 +01:00
ffcdb84714
Disable tipping for the time being
2019-01-15 17:10:30 +01:00
07e0eb005b
Create recordings dir, if it does not exist in getRecordingsFileStore
2019-01-11 15:35:01 +01:00
f24959b76e
Switch token data type to double
...
LiveJasmin and maybe other sites use a more currency like token system
2019-01-10 14:22:26 +01:00
bf6b715642
Login every 30 min to LiveJasmin so that the session does not expire
2019-01-09 20:35:31 +01:00
196b82dfa3
Consider empty recordings as too short
2019-01-09 20:34:52 +01:00
45df31eb15
Properly end websocket download
...
End the websocket download if a model changes state from online. Also
properly close both sockets and set isAlive to false, if the download is
closed or fails
2019-01-09 20:34:25 +01:00
4516b8d787
Fix parsing of model name for recordings
2019-01-09 15:11:18 +01:00
dc946e407f
Merge branch 'dev' into jasmin
2019-01-08 14:33:16 +01:00
0xboobface