Skip to content

Commit 1de24e8

Browse files
committed
Put evernote dev-token in config file
1 parent 557f3ce commit 1de24e8

File tree

3 files changed

+49
-9
lines changed

3 files changed

+49
-9
lines changed

pypdfocr/pypdfocr.py

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16+
import smtplib
1617
import argparse
1718
import sys, os
1819
import logging
@@ -192,7 +193,7 @@ def _setup_filing(self):
192193

193194
# Start the filing object
194195
if self.enable_evernote:
195-
self.filer = PyFilerEvernote()
196+
self.filer = PyFilerEvernote(self.config['evernote_developer_token'])
196197
else:
197198
self.filer = PyFilerDirs()
198199

@@ -234,11 +235,40 @@ def file_converted_file(self, ocr_pdffilename, original_pdffilename):
234235
if tgt_path != original_pdffilename:
235236
print("Filed original file %s to %s as %s" % (original_pdffilename, os.path.dirname(tgt_path), os.path.basename(tgt_path)))
236237

238+
239+
def _send_email(self, from_addr, to_addr_list, cc_addr_list,
240+
subject, message,
241+
login, password,
242+
smtpserver):
243+
header = 'From: %s\n' % from_addr
244+
header += 'To: %s\n' % ','.join(to_addr_list)
245+
header += 'Cc: %s\n' % ','.join(cc_addr_list)
246+
header += 'Subject: %s\n\n' % subject
247+
message = header + message
248+
249+
server = smtplib.SMTP(smtpserver)
250+
server.starttls()
251+
server.login(login,password)
252+
problems = server.sendmail(from_addr, to_addr_list, message)
253+
server.quit()
254+
237255
def go(self, argv):
238256

239257
# Read the command line options
240258
self.get_options(argv)
241259

260+
#
261+
#self._send_email(
262+
#from_addr="[email protected]",
263+
#to_addr_list=["[email protected]"],
264+
#cc_addr_list = [],
265+
#subject = "PyPDFOCR upload",
266+
#message = "Uploaded email\n\n-Virantha",
267+
#login = "[email protected]",
268+
#password = "cctahvuntxbuwmox",
269+
#smtpserver = "smtp.gmail.com:587",
270+
#)
271+
242272
# Setup the pdf filing if enabled
243273
if self.enable_filing:
244274
self._setup_filing()

pypdfocr/pypdfocr_filer_evernote.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import shutil
1818
import hashlib
1919
import time
20+
import sys
2021

2122
from pypdfocr_filer import PyFiler
2223

@@ -104,12 +105,12 @@ def set_default_folder (self, default_folder):
104105

105106
default_folder = property(get_default_folder, set_default_folder)
106107

107-
def __init__(self):
108+
def __init__(self, dev_token):
108109
self.target_folder = None
109110
self.default_folder = None
110111
self.original_move_folder = None
111112
self.folder_targets = {}
112-
self.dictUserInfo = { 'dev_token': "S=s1:U=889c2:E=1493ed0d350:C=141e71fa753:P=1cd:A=en-devtoken:V=2:H=3b99efdea7ff9c8db33f32f1dd0bbc35"}
113+
self.dictUserInfo = { 'dev_token': dev_token }
113114
self._connect_to_evernote(self.dictUserInfo)
114115

115116
def _connect_to_evernote(self, dictUserInfo):
@@ -122,9 +123,19 @@ def _connect_to_evernote(self, dictUserInfo):
122123
print("Authenticating to Evernote")
123124
dev_token = dictUserInfo['dev_token']
124125
logging.debug("Authenticating using token %s" % dev_token)
125-
self.client = EvernoteClient(token=dev_token)
126-
self.user_store = self.client.get_user_store()
127-
user = self.user_store.getUser()
126+
try:
127+
self.client = EvernoteClient(token=dev_token)
128+
self.user_store = self.client.get_user_store()
129+
user = self.user_store.getUser()
130+
except EDAMUserException as e:
131+
err = e.errorCode
132+
print("Error attempting to authenticate to Evernote: %s - %s" % (EDAMErrorCode._VALUES_TO_NAMES[err], e.parameter))
133+
except EDAMSystemException as e:
134+
err = e.errorCode
135+
print("Error attempting to authenticate to Evernote: %s - %s" % (EDAMErrorCode._VALUES_TO_NAMES[err], e.message))
136+
sys.exit(-1)
137+
138+
128139
print("Authenticated to evernote as user %s" % user.username)
129140
return True
130141

@@ -238,7 +249,7 @@ def move_to_matching_folder(self, filename, foldername):
238249
note = note_store.createNote(note)
239250
os.remove(filename)
240251

241-
return "%s/%s" % (notebook.name, foldername)
252+
return "%s/%s" % (notebook.name, note.title)
242253

243254
def _get_unique_filename_by_appending_version_integer(self, tgtfilename):
244255
if os.path.exists(tgtfilename):

pypdfocr/pypdfocr_pdffiler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@ def iter_pdf_page_text(self, filename):
4545

4646
def _get_matching_folder(self, pdfText):
4747
searchText = pdfText.lower()
48-
print searchText
4948
for folder,strings in self.filer.folder_targets.items():
5049
for s in strings:
51-
logging.info("Checking string %s" % s)
50+
logging.debug("Checking string %s" % s)
5251
if s in searchText:
5352
logging.info("Matched keyword '%s'" % s)
5453
return folder

0 commit comments

Comments
 (0)