liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address comments in pull request:

Browse Source 
- use "const" where possible
 - add spaces after commas
 - use dateTimeFormatExamples by reference (don't copy)
 - fix incorrect cast to unsigned int (declare variable as gunichar)
This commit is contained in:
Scott Gilbertson
2024-02-28 13:09:25 -05:00
parent 1db8b0d643
commit cd64ced60f
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtgui/batchqueue.cc
View File

@@ -100,9 +100,9 @@ namespace // local helper functions
// use that string to format dateTime. Append the formatted time to path.
void appendFormattedTime(Glib::ustring& path, unsigned int& ix, const Glib::ustring& templateText, const Glib::DateTime& dateTime)
{
constexpr unsigned int quoteMark = (unsigned int)'"';
constexpr gunichar quoteMark('"');
if ((ix + 1) < templateText.size() && templateText[ix] == quoteMark) {
auto endPos = templateText.find_first_of(quoteMark, ++ix);
const auto endPos = templateText.find_first_of(quoteMark, ++ix);
if (endPos != Glib::ustring::npos) {
Glib::ustring formatString(templateText, ix, endPos-ix);
path += dateTime.format(formatString);
@@ -1024,8 +1024,10 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
switch(options.savePathTemplate[ix++])
{
case 'E': // (approximate) time when export started
{
dateTime = Glib::DateTime::create_now_local();
break;
}
case 'F': // time when file was last saved
{
Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(origFileName);
@@ -1035,16 +1037,18 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
dateTime = info->get_modification_date_time();
}
}
}
break;
}
case 'P': // time when picture was taken
{
auto timestamp = FramesData(origFileName).getDateTimeAsTS();
const auto timestamp = FramesData(origFileName).getDateTimeAsTS();
dateTime = Glib::DateTime::create_now_local(timestamp);
break;
}
break;
default:
{
break;
}
}
if (dateTime) {
appendFormattedTime(path, ix, options.savePathTemplate, dateTime);