From b80684a77b0344e190ea0d1563a484aa746ef07c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Sep 2011 21:39:07 -0600
Subject: [PATCH] Fix pubdate incorrect when used in save to disk template in
 timezones ahead of GMT. Fixes #844445 (Using pubdate in save to disk file
 names)

---
 src/calibre/db/tests/metadata.db    | Bin 230400 -> 230400 bytes
 src/calibre/library/save_to_disk.py |   7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/db/tests/metadata.db b/src/calibre/db/tests/metadata.db
index 5693b3d83d9651798a799d230ea5d8da4125693c..63a096e2f44d9ecce9f32da2f408d56ebe6949ce 100644
GIT binary patch
delta 190
zcmZqZ;A`mMn;^{?Fj2;tF<@iD{KJefn~t<GGsaDBKd#6cE5U5aIK9z^S)}>k@%Dqq
z8Mhxi&g5Joz{+6607QNasSMQ&)0teSD|#}EPS><y&f7k{hB=3MJF^2blgjkv_ROKv
z_op+nO|CpBx?MhnnTdIOc{+2i2nQ2W83Xfern2cgHOy&j%CRgA?t+uMkIOPe$AV0_
g&&bgg701fpKBacE@1aOWE(QjMTPUiQH88UP0DE6LL;wH)

delta 186
zcmV;r07d_Rhz@{=4v-rGPLUi#0Zy@CpThxLvc!f11zRBlM*)}Ne*+x_S{MU00hfV1
z0~CY7$A`hk0k^@&0z-5V1_8SO0lNX$0qz0>0w4lKmmx_56_+VI18xKW00U{an>+&`
z0kgZoKmrA10002mwm<^~B)3~+0~`YhaCKsAX>(|0a+iQ-0~MENX9E!fVP|uf0cQgw
ow|8d)jT8t00G9v&mjKY0415D-mvVpuCAXJ618f7g1Aqhl12g718vp<R

diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py
index 71fc1375ad..aebb853805 100644
--- a/src/calibre/library/save_to_disk.py
+++ b/src/calibre/library/save_to_disk.py
@@ -17,7 +17,7 @@ from calibre.ebooks.metadata.opf2 import metadata_to_opf
 from calibre.constants import preferred_encoding
 from calibre.ebooks.metadata import fmt_sidx
 from calibre.ebooks.metadata import title_sort
-from calibre.utils.date import parse_date
+from calibre.utils.date import parse_date, as_local_time
 from calibre import strftime, prints, sanitize_file_name_unicode
 
 plugboard_any_device_value = 'any device'
@@ -281,6 +281,11 @@ def do_save_book_to_disk(id_, mi, cover, plugboards,
         format_map, root, opts, length):
     from calibre.ebooks.metadata.meta import set_metadata
     available_formats = [x.lower().strip() for x in format_map.keys()]
+    if mi.pubdate:
+        mi.pubdate = as_local_time(mi.pubdate)
+    if mi.timestamp:
+        mi.timestamp = as_local_time(mi.timestamp)
+
     if opts.formats == 'all':
         asked_formats = available_formats
     else: