diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index 8c8991a..8325f82 100644
a
|
b
|
bool ProgramInfo::LoadProgramFromRecorded( |
1589 | 1589 | "WHERE r.chanid = :CHANID AND " |
1590 | 1590 | " r.starttime = :RECSTARTTS"); |
1591 | 1591 | query.bindValue(":CHANID", _chanid); |
1592 | | query.bindValue(":RECSTARTTS", _recstartts); |
| 1592 | query.bindValue(":RECSTARTTS", _recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
1593 | 1593 | |
1594 | 1594 | if (!query.exec()) |
1595 | 1595 | { |
… |
… |
void ProgramInfo::UpdateLastDelete(bool setTime) const |
2669 | 2669 | } |
2670 | 2670 | else |
2671 | 2671 | { |
2672 | | query.prepare("UPDATE record SET last_delete = '0000-00-00T00:00:00' " |
| 2672 | query.prepare("UPDATE record SET last_delete = '0000-00-00 00:00:00' " |
2673 | 2673 | "WHERE recordid = :RECORDID"); |
2674 | 2674 | } |
2675 | 2675 | query.bindValue(":RECORDID", recordid); |
… |
… |
void ProgramInfo::SaveMarkupMap( |
2888 | 2888 | " (chanid, starttime, mark, type)" |
2889 | 2889 | " VALUES ( :CHANID , :STARTTIME , :MARK , :TYPE );"); |
2890 | 2890 | query.bindValue(":CHANID", chanid); |
2891 | | query.bindValue(":STARTTIME", recstartts); |
| 2891 | query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
2892 | 2892 | } |
2893 | 2893 | query.bindValue(":MARK", (quint64)frame); |
2894 | 2894 | query.bindValue(":TYPE", mark_type); |
… |
… |
void ProgramInfo::SaveAspect( |
3288 | 3288 | " VALUES" |
3289 | 3289 | " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
3290 | 3290 | query.bindValue(":CHANID", chanid); |
3291 | | query.bindValue(":STARTTIME", recstartts); |
| 3291 | query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
3292 | 3292 | |
3293 | 3293 | query.bindValue(":MARK", (quint64)frame); |
3294 | 3294 | query.bindValue(":TYPE", type); |
… |
… |
void ProgramInfo::SaveFrameRate(uint64_t frame, uint framerate) |
3317 | 3317 | " VALUES" |
3318 | 3318 | " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
3319 | 3319 | query.bindValue(":CHANID", chanid); |
3320 | | query.bindValue(":STARTTIME", recstartts); |
| 3320 | query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
3321 | 3321 | query.bindValue(":MARK", (quint64)frame); |
3322 | 3322 | query.bindValue(":TYPE", MARK_VIDEO_RATE); |
3323 | 3323 | query.bindValue(":DATA", framerate); |
… |
… |
void ProgramInfo::SaveTotalDuration(int64_t duration) |
3351 | 3351 | " VALUES" |
3352 | 3352 | " ( :CHANID, :STARTTIME, 0, :TYPE, :DATA);"); |
3353 | 3353 | query.bindValue(":CHANID", chanid); |
3354 | | query.bindValue(":STARTTIME", recstartts); |
| 3354 | query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
3355 | 3355 | query.bindValue(":TYPE", MARK_DURATION_MS); |
3356 | 3356 | query.bindValue(":DATA", (uint)(duration / 1000)); |
3357 | 3357 | |
… |
… |
void ProgramInfo::SaveResolution(uint64_t frame, uint width, uint height) |
3375 | 3375 | " VALUES" |
3376 | 3376 | " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
3377 | 3377 | query.bindValue(":CHANID", chanid); |
3378 | | query.bindValue(":STARTTIME", recstartts); |
| 3378 | query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
3379 | 3379 | query.bindValue(":MARK", (quint64)frame); |
3380 | 3380 | query.bindValue(":TYPE", MARK_VIDEO_WIDTH); |
3381 | 3381 | query.bindValue(":DATA", width); |
… |
… |
void ProgramInfo::SaveResolution(uint64_t frame, uint width, uint height) |
3388 | 3388 | " VALUES" |
3389 | 3389 | " ( :CHANID, :STARTTIME, :MARK, :TYPE, :DATA);"); |
3390 | 3390 | query.bindValue(":CHANID", chanid); |
3391 | | query.bindValue(":STARTTIME", recstartts); |
| 3391 | query.bindValue(":STARTTIME", recstartts.toString("yyyy-MM-dd hh:mm:ss")); |
3392 | 3392 | query.bindValue(":MARK", (quint64)frame); |
3393 | 3393 | query.bindValue(":TYPE", MARK_VIDEO_HEIGHT); |
3394 | 3394 | query.bindValue(":DATA", height); |
diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
index fa43d1a..f21ec29 100644
a
|
b
|
NULL |
2019 | 2019 | "UPDATE settings SET value = 'MythFillGrabberSuggestsTime' " |
2020 | 2020 | "WHERE value = 'HonorGrabberNextSuggestedMythfilldatabaseRunTime';", |
2021 | 2021 | "UPDATE settings SET value = 'MythFillSuggestedRunTime', " |
2022 | | " data = '1970-01-01T00:00:00' " |
| 2022 | " data = '1970-01-01 00:00:00' " |
2023 | 2023 | "WHERE value = 'NextSuggestedMythfilldatabaseRun';", |
2024 | 2024 | NULL |
2025 | 2025 | }; |
diff --git a/mythtv/libs/libmythtv/recordinginfo.cpp b/mythtv/libs/libmythtv/recordinginfo.cpp
index da235dd..08bdb7e 100644
a
|
b
|
void RecordingInfo::AddHistory(bool resched, bool forcedup) |
1141 | 1141 | ":CATEGORY,:SERIESID,:PROGRAMID,:FINDID,:RECORDID," |
1142 | 1142 | ":STATION,:RECTYPE,:RECSTATUS,:DUPLICATE,:REACTIVATE);"); |
1143 | 1143 | result.bindValue(":CHANID", chanid); |
1144 | | result.bindValue(":START", startts.toString(Qt::ISODate)); |
1145 | | result.bindValue(":END", endts.toString(Qt::ISODate)); |
| 1144 | result.bindValue(":START", startts.toString("yyyy-MM-dd hh:mm:ss")); |
| 1145 | result.bindValue(":END", endts.toString("yyyy-MM-dd hh:mm:ss")); |
1146 | 1146 | result.bindValue(":TITLE", title); |
1147 | 1147 | result.bindValue(":SUBTITLE", subtitle); |
1148 | 1148 | result.bindValue(":DESC", description); |
diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index bd81323..76b5308 100644
a
|
b
|
void Scheduler::UpdateRecStatus(RecordingInfo *pginfo) |
532 | 532 | { |
533 | 533 | if (p->GetRecordingStatus() != pginfo->GetRecordingStatus()) |
534 | 534 | { |
535 | | VERBOSE(VB_IMPORTANT, |
| 535 | VERBOSE(VB_IMPORTANT, |
536 | 536 | QString("Updating status for %1 on cardid %2 (%3 => %4)") |
537 | 537 | .arg(p->toString(ProgramInfo::kTitleSubtitle)) |
538 | 538 | .arg(p->GetCardID()) |
539 | | .arg(toString(p->GetRecordingStatus(), |
| 539 | .arg(toString(p->GetRecordingStatus(), |
540 | 540 | p->GetRecordingRuleType())) |
541 | | .arg(toString(pginfo->GetRecordingStatus(), |
| 541 | .arg(toString(pginfo->GetRecordingStatus(), |
542 | 542 | p->GetRecordingRuleType()))); |
543 | | bool resched = |
| 543 | bool resched = |
544 | 544 | ((p->GetRecordingStatus() != rsRecording && |
545 | 545 | p->GetRecordingStatus() != rsTuning) || |
546 | 546 | (pginfo->GetRecordingStatus() != rsRecording && |
… |
… |
void Scheduler::UpdateRecStatus(uint cardid, uint chanid, |
577 | 577 | |
578 | 578 | if (p->GetRecordingStatus() != recstatus) |
579 | 579 | { |
580 | | VERBOSE(VB_IMPORTANT, |
| 580 | VERBOSE(VB_IMPORTANT, |
581 | 581 | QString("Updating status for %1 on cardid %2 (%3 => %4)") |
582 | 582 | .arg(p->toString(ProgramInfo::kTitleSubtitle)) |
583 | 583 | .arg(p->GetCardID()) |
584 | | .arg(toString(p->GetRecordingStatus(), |
| 584 | .arg(toString(p->GetRecordingStatus(), |
585 | 585 | p->GetRecordingRuleType())) |
586 | | .arg(toString(recstatus, |
| 586 | .arg(toString(recstatus, |
587 | 587 | p->GetRecordingRuleType()))); |
588 | | bool resched = |
| 588 | bool resched = |
589 | 589 | ((p->GetRecordingStatus() != rsRecording && |
590 | 590 | p->GetRecordingStatus() != rsTuning) || |
591 | 591 | (recstatus != rsRecording && |
… |
… |
void Scheduler::UpdateNextRecord(void) |
1446 | 1446 | if (nextRecMap[recid].isNull() || !next_record.isValid()) |
1447 | 1447 | { |
1448 | 1448 | subquery.prepare("UPDATE record " |
1449 | | "SET next_record = '0000-00-00T00:00:00' " |
| 1449 | "SET next_record = '0000-00-00 00:00:00' " |
1450 | 1450 | "WHERE recordid = :RECORDID;"); |
1451 | 1451 | subquery.bindValue(":RECORDID", recid); |
1452 | 1452 | } |
… |
… |
void Scheduler::UpdateNextRecord(void) |
1455 | 1455 | subquery.prepare("UPDATE record SET next_record = :NEXTREC " |
1456 | 1456 | "WHERE recordid = :RECORDID;"); |
1457 | 1457 | subquery.bindValue(":RECORDID", recid); |
1458 | | subquery.bindValue(":NEXTREC", nextRecMap[recid]); |
| 1458 | subquery.bindValue(":NEXTREC", nextRecMap[recid].toString("yyyy-MM-dd hh:mm:ss")); |
1459 | 1459 | } |
1460 | 1460 | if (!subquery.exec()) |
1461 | 1461 | MythDB::DBError("Update next_record", subquery); |
… |
… |
static bool comp_storage_perc_free_space(FileSystemInfo *a, FileSystemInfo *b) |
3876 | 3876 | if (b->totalSpaceKB == 0) |
3877 | 3877 | return true; |
3878 | 3878 | |
3879 | | if ((a->freeSpaceKB * 100.0) / a->totalSpaceKB > |
| 3879 | if ((a->freeSpaceKB * 100.0) / a->totalSpaceKB > |
3880 | 3880 | (b->freeSpaceKB * 100.0) / b->totalSpaceKB) |
3881 | 3881 | return true; |
3882 | 3882 | |