Merge pull request #32 from Hamuko/master

CLI option to specify config file location

PixivConfig.py

@@ -73,8 +73,12 @@ class PixivConfig:
     skipDumpFilter = ""
     dumpMediumPage = False
 
-    def loadConfig(self):
-        configFile = script_path + os.sep + 'config.ini'
+    def loadConfig(self, path=None):
+        if path != None:
+            configFile = path
+        else:
+            configFile = script_path + os.sep + 'config.ini'
+
         print 'Reading', configFile, '...'
         oldSetting = False
         haveError = False
@@ -374,7 +378,7 @@ def loadConfig(self):
 
 
     #-UI01B------write config
-    def writeConfig(self, error=False):
+    def writeConfig(self, error=False, path=None):
         '''Backup old config if exist and write updated config.ini'''
         print 'Writing config file...',
         config = ConfigParser.RawConfigParser()
@@ -428,19 +432,24 @@ def writeConfig(self, error=False):
         config.set('Pixiv', 'numberOfPage', self.numberOfPage)
         config.set('Pixiv', 'R18Mode', self.r18mode)
 
+        if path != None:
+            configlocation = path
+        else:
+            configlocation = 'config.ini'
+
         try:
             ##with codecs.open('config.ini.bak', encoding = 'utf-8', mode = 'wb') as configfile:
-            with open('config.ini.tmp', 'w') as configfile:
+            with open(configlocation + '.tmp', 'w') as configfile:
                 config.write(configfile)
-            if os.path.exists('config.ini'):
+            if os.path.exists(configlocation):
                 if error:
-                    backupName = 'config.ini.error-' + str(int(time.time()))
+                    backupName = configlocation + '.error-' + str(int(time.time()))
                     print "Backing up old config (error exist!) to " + backupName
-                    shutil.move('config.ini', backupName)
+                    shutil.move(configlocation, backupName)
                 else:
                     print "Backing up old config to config.ini.bak"
-                    shutil.move('config.ini', 'config.ini.bak')
-            os.rename('config.ini.tmp', 'config.ini')
+                    shutil.move(configlocation, configlocation + '.bak')
+            os.rename(configlocation + '.tmp', configlocation)
         except:
             self.__logger.exception('Error at writeConfig()')
             raise

PixivUtil2.py

@@ -287,7 +287,7 @@ def pixiv_process_login(response):
             if cookie.name == 'PHPSESSID':
                 print 'new cookie value:', cookie.value
                 __config__.cookie = cookie.value
-                __config__.writeConfig()
+                __config__.writeConfig(path=configfile)
                 break
         return True
     else:
@@ -388,7 +388,7 @@ def process_member(mode, member_id, user_dir='', page=1, end_page=0, bookmark=Fa
     elif __config__.numberOfPage != 0:
         PixivHelper.printAndLog('info', 'End Page from config: ' + str(__config__.numberOfPage))
 
-    __config__.loadConfig()
+    __config__.loadConfig(path=configfile)
     list_page = None
     try:
         no_of_images = 1
@@ -824,7 +824,7 @@ def process_tags(mode, tags, page=1, end_page=0, wild_card=True, title_caption=F
                start_date=None, end_date=None, use_tags_as_dir=False, member_id=None,
                bookmark_count=None):
     try:
-        __config__.loadConfig()  # Reset the config for root directory
+        __config__.loadConfig(path=configfile)  # Reset the config for root directory
 
         try:
             if tags.startswith("%"):
@@ -1567,7 +1567,7 @@ def menu_export_online_bookmark(mode, opisvalid, args):
 
 def menu_reload_config():
     __log__.info('Manual Reload Config.')
-    __config__.loadConfig()
+    __config__.loadConfig(path=configfile)
 
 
 def menu_print_config():
@@ -1606,6 +1606,9 @@ def setup_option_parser():
                       action='store_true', default=False)
     parser.add_option('-n', '--numberofpages', dest='numberofpages',
                       help='temporarily overwrites numberOfPage set in config.ini')
+    parser.add_option('-c', '--config', dest='configlocation',
+                      help='load the config file from a custom location',
+                      default=None)
     return parser
 
 
@@ -1690,6 +1693,7 @@ def main():
     global start_iv  # used in download_image
     global op
     global __br__
+    global configfile
 
     parser = setup_option_parser()
     (options, args) = parser.parse_args()
@@ -1705,6 +1709,7 @@ def main():
         # Yavos: use print option instead when program should be running even with this error
 
     ewd = options.exitwhendone
+    configfile = options.configlocation
 
     try:
         if options.numberofpages is not None:
@@ -1721,7 +1726,7 @@ def main():
     __log__.info('###############################################################')
     __log__.info('Starting...')
     try:
-        __config__.loadConfig()
+        __config__.loadConfig(path=configfile)
         PixivHelper.setConfig(__config__)
     except:
         print 'Failed to read configuration.'