Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Commit

Permalink
load environment vars from env file and get proxy info from OS
Browse files Browse the repository at this point in the history
  • Loading branch information
Guts committed Jul 3, 2019
1 parent 5596800 commit a7c5845
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 27 deletions.
35 changes: 14 additions & 21 deletions IsogeoToOffice.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,30 @@

# standard library
import logging
import pathlib # TO DO: replace os.path by pathlib
import platform
from datetime import datetime
from functools import partial
from logging.handlers import RotatingFileHandler
from os import listdir, path
import pathlib # TO DO: replace os.path by pathlib

# 3rd party
import qdarkstyle
import semver
from dotenv import load_dotenv
from isogeo_pysdk import __version__ as pysdk_version
from PyQt5.QtCore import QLocale, QSettings, QThread, QTranslator, pyqtSignal, pyqtSlot

# PyQt
from PyQt5.QtCore import (
QLocale, QSettings, QThread, QTranslator, pyqtSignal, pyqtSlot)
from PyQt5.QtGui import QCloseEvent, QIcon
from PyQt5.QtWidgets import (
QApplication,
QComboBox,
QMainWindow,
QMessageBox,
QStyleFactory,
)

import semver
QApplication, QComboBox, QMainWindow, QMessageBox, QStyleFactory)

# submodules - functional
from modules import (
IsogeoApiMngr,
ThreadAppProperties,
ThreadExportExcel,
ThreadExportWord,
ThreadExportXml,
ThreadSearch,
ThreadThumbnails,
isogeo2office_utils,
)

from modules import (IsogeoApiMngr, ThreadAppProperties, ThreadExportExcel,
ThreadExportWord, ThreadExportXml, ThreadSearch,
ThreadThumbnails, isogeo2office_utils)
# submodules - UI
from modules.ui.auth.auth_dlg import Auth
from modules.ui.credits.credits_dlg import Credits
Expand All @@ -59,6 +49,9 @@
# ########## Globals ###############
# ##################################

# load specific enviroment vars
load_dotenv(".env")

# required subfolders
pathlib.Path("_auth/").mkdir(exist_ok=True)
pathlib.Path("_logs/").mkdir(exist_ok=True)
Expand Down
16 changes: 11 additions & 5 deletions modules/utils/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,33 @@
#! python3

# Standard library
from functools import partial
import json
import logging
import time
from functools import partial
from os import path, rename
from pathlib import Path # TO DO: replace os.path by pathlib
import time
from urllib.request import getproxies

# PyQT
from PyQt5.QtWidgets import QDialog, QErrorMessage
from PyQt5.QtCore import QLocale, QSettings
# 3rd party
from dotenv import load_dotenv

# Isogeo
from isogeo_pysdk import Isogeo, IsogeoChecker
from isogeo_pysdk import __version__ as pysdk_version

# PyQT
from PyQt5.QtCore import QLocale, QSettings
from PyQt5.QtWidgets import QDialog, QErrorMessage

# submodules
from .utils import isogeo2office_utils

# ############################################################################
# ########## Globals ###############
# ##################################

load_dotenv(".env")
app_utils = isogeo2office_utils()
current_locale = QLocale()
logger = logging.getLogger("isogeo2office")
Expand Down Expand Up @@ -91,6 +96,7 @@ def manage_api_initialization(self):
client_id=self.api_app_id,
client_secret=self.api_app_secret,
lang=current_locale.name()[:2],
proxy=getproxies(),
)
self.token = self.isogeo.connect()
logger.debug("Connection succeeded")
Expand Down
1 change: 0 additions & 1 deletion modules/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,3 @@ def clean_xml(self, invalid_xml, mode: str = "soft", substitute: str = "_"):
utils = isogeo2office_utils()

utils.clean_credentials_files(r"_auth")

0 comments on commit a7c5845

Please sign in to comment.