Merge pull request #4 from laixintao/osx-support

move read_config() out of class

Author: kingname

MarkdownPicPicker.py

@@ -4,6 +4,7 @@
 import time
 import sys
 import os
+
 try:
     import pythoncom
 except ImportError:
@@ -20,9 +21,10 @@
 __version__ = '0.2.2'
 __author__ = 'kingname'
 
+from config import read_config
 
-class MarkrdownPicPicker(object):
 
+class MarkrdownPicPicker(object):
     CONFIG_PATH = 'config.ini'
 
     def __init__(self, link_only=False):
@@ -45,8 +47,17 @@ def __init__(self, link_only=False):
         elif self.method == 'global_listen':
             self.keyboard_listen()
 
+    def _to_string(self):
+        """
+        To test if the config reading is ok
+        :return: None
+        """
+        print("folder", self.picture_folder)
+        print("suffix", self.picture_suffix)
+        print("picture_bed", self.picture_bed)
+
     def init_environment(self):
-        self.read_config()
+        self.__dict__.update(read_config())
         if not self.method \
                 or not self.picture_folder \
                 or not self.picture_suffix \
@@ -55,28 +66,8 @@ def init_environment(self):
             exit()
         if not os.path.exists(self.picture_folder):
             os.makedirs(self.picture_folder)
-
-    def read_config(self):
-        if getattr(sys, 'frozen', None):
-            config_path = os.path.join(os.path.dirname(sys.executable), self.CONFIG_PATH)
-        else:
-            config_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), self.CONFIG_PATH)
-        configs = ConfigParser()
-        if not os.path.exists(config_path):
-            print('can not find the config.ini, exit')
-            exit()
-        configs.read(config_path)
-        self.method = configs['basic'].get('run_method', '')
-        self.picture_folder = configs['basic'].get('picture_folder', '')
-        self.picture_suffix = configs['basic'].get('picture_suffix', '')
-        self.picture_bed = configs['basic'].get('picture_bed', '')
-
         if self.picture_bed:
-            self.uploader = QiniuUploader(configs['qiniu'])
-
-        if self.method == 'global_listen':
-            self.short_key_one = configs['global_listen']['short_key_one']
-            self.short_key_two = configs['global_listen']['short_key_two']
+            self.uploader = QiniuUploader(self.uploader_info)
 
     def keyboard_listen(self):
         if not pythoncom or not pyHook:
@@ -125,6 +116,7 @@ def save_picture(self):
             print('get picture from clipboard error because: {}'.format(e))
         return '', ''
 
+
 if __name__ == '__main__':
     arg = sys.argv[-1]
     if arg == '-linkonly':

config/__init__.py

@@ -0,0 +1,33 @@
+import sys, os
+from configparser import ConfigParser
+
+
+def read_config():
+    _dict = {}
+    if getattr(sys, 'frozen', None):
+        config_path = os.path.join(os.path.dirname(sys.executable), 'config.ini')
+    else:
+        config_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config.ini')
+    print(config_path)
+    configs = ConfigParser()
+    if not os.path.exists(config_path):
+        print('can not find the config.ini, exit')
+        exit()
+    configs.read(config_path)
+    _dict['method'] = configs['basic'].get('run_method', '')
+    _dict['picture_folder'] = configs['basic'].get('picture_folder', '')
+    _dict['picture_suffix'] = configs['basic'].get('picture_suffix', '')
+    _dict['picture_bed'] = configs['basic'].get('picture_bed', '')
+
+    if _dict['picture_bed']:
+        _dict['uploader_info'] = configs['qiniu']
+
+    if _dict['method'] == 'global_listen':
+        _dict['short_key_one'] = configs['global_listen']['short_key_one']
+        _dict['short_key_two'] = configs['global_listen']['short_key_two']
+
+    return _dict
+
+
+if __name__ == '__main__':
+    print(read_config())

config.ini config/config.iniconfig.ini renamed to config/config.ini

@@ -0,0 +1,25 @@
+import datetime
+import os
+import sys
+import atexit
+from subprocess import call
+
+
+def capture():
+    try:
+        call(['/usr/local/bin/pngpaste', '-v'], stderr=open('/dev/null', 'w'))
+    except OSError:
+        print('please preinstall pngpaste use `brew install pngpaste` before use this script')
+        sys.exit()
+
+    file_name = datetime.datetime.now().strftime('%Y_%m_%d_%H_%M_%S.png')
+    file_path = os.path.join('/tmp', file_name)
+    atexit.register(lambda x: os.remove(x) if os.path.exists(x) else None, file_path)
+    save = call(['/usr/local/bin/pngpaste', file_path])
+    if save == 1:
+        sys.exit()
+    return file_path, file_name
+
+
+if __name__ == '__main__':
+    print(capture())