mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Limiting the length of the recording name in timers created via SVDRP in case VDR is run with --vfat
This commit is contained in:
parent
5a44b8b801
commit
e1eb84db49
@ -1040,6 +1040,9 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
|
|||||||
for some fixes to PLUGINS.html
|
for some fixes to PLUGINS.html
|
||||||
for fixing handling CONFDIR
|
for fixing handling CONFDIR
|
||||||
for updating the Makefile of the skincurses plugin
|
for updating the Makefile of the skincurses plugin
|
||||||
|
for suggesting to limit the length of the recording name in timers created via
|
||||||
|
SVDRP in case VDR is run with --vfat, in order to avoid names that are too long
|
||||||
|
for Windows
|
||||||
|
|
||||||
Ralf Klueber <ralf.klueber@vodafone.com>
|
Ralf Klueber <ralf.klueber@vodafone.com>
|
||||||
for reporting a bug in cutting a recording if there is only a single editing mark
|
for reporting a bug in cutting a recording if there is only a single editing mark
|
||||||
|
3
HISTORY
3
HISTORY
@ -5613,3 +5613,6 @@ Video Disk Recorder Revision History
|
|||||||
- Fixed detecting directories in cFileNameList::Load().
|
- Fixed detecting directories in cFileNameList::Load().
|
||||||
- Running the thread that removes deleted recordings at a low priority to (maybe)
|
- Running the thread that removes deleted recordings at a low priority to (maybe)
|
||||||
avoid stuttering replay in case the thread is run during replay.
|
avoid stuttering replay in case the thread is run during replay.
|
||||||
|
- Limiting the length of the recording name in timers created via SVDRP in case VDR
|
||||||
|
is run with --vfat, in order to avoid names that are too long for Windows
|
||||||
|
(suggested by Rolf Ahrenberg).
|
||||||
|
25
svdrp.c
25
svdrp.c
@ -10,7 +10,7 @@
|
|||||||
* and interact with the Video Disk Recorder - or write a full featured
|
* and interact with the Video Disk Recorder - or write a full featured
|
||||||
* graphical interface that sits on top of an SVDRP connection.
|
* graphical interface that sits on top of an SVDRP connection.
|
||||||
*
|
*
|
||||||
* $Id: svdrp.c 1.105 2008/01/13 15:06:25 kls Exp $
|
* $Id: svdrp.c 1.106 2008/02/10 13:37:18 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "svdrp.h"
|
#include "svdrp.h"
|
||||||
@ -40,6 +40,8 @@
|
|||||||
#include "tools.h"
|
#include "tools.h"
|
||||||
#include "videodir.h"
|
#include "videodir.h"
|
||||||
|
|
||||||
|
#define VFAT_MAX_FILENAME 40 // same as MAX_SUBTITLE_LENGTH in recording.c
|
||||||
|
|
||||||
// --- cSocket ---------------------------------------------------------------
|
// --- cSocket ---------------------------------------------------------------
|
||||||
|
|
||||||
cSocket::cSocket(int Port, int Queue)
|
cSocket::cSocket(int Port, int Queue)
|
||||||
@ -1179,6 +1181,16 @@ void cSVDRP::CmdMODT(const char *Option)
|
|||||||
Reply(501, "Error in timer settings");
|
Reply(501, "Error in timer settings");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (VfatFileSystem) {
|
||||||
|
const char *FileName = timer->File();
|
||||||
|
const char *p = strrchr(FileName, '~');
|
||||||
|
if (!p)
|
||||||
|
p = FileName;
|
||||||
|
if (strlen(p) > VFAT_MAX_FILENAME) {
|
||||||
|
Reply(501, "File name too long for VFAT file system");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
*timer = t;
|
*timer = t;
|
||||||
Timers.SetModified();
|
Timers.SetModified();
|
||||||
isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
|
isyslog("timer %s modified (%s)", *timer->ToDescr(), timer->HasFlags(tfActive) ? "active" : "inactive");
|
||||||
@ -1285,6 +1297,17 @@ void cSVDRP::CmdNEWT(const char *Option)
|
|||||||
if (*Option) {
|
if (*Option) {
|
||||||
cTimer *timer = new cTimer;
|
cTimer *timer = new cTimer;
|
||||||
if (timer->Parse(Option)) {
|
if (timer->Parse(Option)) {
|
||||||
|
if (VfatFileSystem) {
|
||||||
|
const char *FileName = timer->File();
|
||||||
|
const char *p = strrchr(FileName, '~');
|
||||||
|
if (!p)
|
||||||
|
p = FileName;
|
||||||
|
if (strlen(p) > VFAT_MAX_FILENAME) {
|
||||||
|
Reply(501, "File name too long for VFAT file system");
|
||||||
|
delete timer;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
cTimer *t = Timers.GetTimer(timer);
|
cTimer *t = Timers.GetTimer(timer);
|
||||||
if (!t) {
|
if (!t) {
|
||||||
Timers.Add(timer);
|
Timers.Add(timer);
|
||||||
|
Loading…
Reference in New Issue
Block a user