refactored app folder structure

pacman_mirrors/classes/mirror.py

-#!/usr/bin/env python
-#
-# This file is part of pacman-mirrors.
-#
-# pacman-mirrors is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# pacman-mirrors is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with pacman-mirrors.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authors: Frede Hundewadt <frede@hundewadt.dk>
-
-"""Pacman-Mirrors Mirror"""
-
-
-class Mirror:
-    """Mirror Class"""
-
-    def __init__(self):
-        self.countrylist = []
-        self.mirrorlist = []
-
-    def add(self, country, url, protocols,
-            branches=None, last_sync="00:00", resp_time="00.00"):
-        """Append mirror
-        :param country:
-        :param url:
-        :param protocols:
-        :param branches: optional from status.json
-        :param last_sync: optional from status.json
-        :param resp_time: optional from status.json
-        """
-        if branches is None:
-            branches = [-1, -1, -1]
-        if country not in self.countrylist:
-            self.countrylist.append(country)
-        # translate negative integer in status.json
-        if last_sync == -1:
-            last_sync = "9999:99"
-            resp_time = "9999.99"
-        # sort protocols in reversed order https,http,ftps,ftp
-        protocols = sorted(protocols, reverse=True)
-        mirror = {
-            "branches": branches,
-            "country": country,
-            "last_sync": last_sync,
-            "protocols": protocols,
-            "resp_time": resp_time,
-            "url": url
-        }
-        self.mirrorlist.append(mirror)
-
-    def seed(self, mirrors, status=False, custom=False):
-        """Seed mirrorlist
-        :param mirrors:
-        :param status:
-        :param custom:
-        """
-        if custom:  # clear previous data
-            self.countrylist = []
-            self.mirrorlist = []
-        for server in mirrors:
-            if status:
-                self.add(server["country"],
-                         server["url"],
-                         server["protocols"],
-                         server["branches"],
-                         server["last_sync"])
-            else:
-                self.add(server["country"],
-                         server["url"],
-                         server["protocols"])

pacman_mirrors/functions/filefn.py

@@ -23,10 +23,10 @@ import datetime
 import os
 import sys
 
-from pacman_mirrors.functions import miscfn
-from pacman_mirrors.constants import txt
 from pacman_mirrors.constants import colors as color
+from pacman_mirrors.constants import txt
 from pacman_mirrors.functions import jsonfn
+from pacman_mirrors.functions import miscfn
 
 
 def check_file(file, dir=False):

pacman_mirrors/functions/httpfn.py

@@ -34,8 +34,8 @@ from urllib.request import urlopen
 
 from pacman_mirrors import __version__
 from pacman_mirrors.config import configuration as conf
-from pacman_mirrors.functions import filefn
 from pacman_mirrors.constants import txt
+from pacman_mirrors.functions import filefn
 from pacman_mirrors.functions import jsonfn
 
 

pacman_mirrors/functions/miscfn.py

@@ -20,8 +20,8 @@
 """Pacman-Mirrors Niscellaneous Functions"""
 import shutil
 
-from pacman_mirrors.constants import txt
 from pacman_mirrors.constants import colors as color
+from pacman_mirrors.constants import txt
 
 
 def debug(where, what, value):

pacman_mirrors/graphicalui.py

@@ -26,8 +26,9 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 from operator import itemgetter
 from random import shuffle
-from pacman_mirrors.translation import i18n
+
 from pacman_mirrors.constants import txt
+from pacman_mirrors.translation import i18n
 
 _ = i18n.language.gettext
 

pacman_mirrors/pacman_mirrors.py

@@ -33,18 +33,18 @@ from operator import itemgetter
 from random import shuffle
 
 from pacman_mirrors import __version__
-from pacman_mirrors.classes.mirror import Mirror
-from pacman_mirrors.config import configuration as conf
 from pacman_mirrors.config import configfn
+from pacman_mirrors.config import configuration as conf
 from pacman_mirrors.constants import colors as color
-from pacman_mirrors.functions import jsonfn
+from pacman_mirrors.constants import txt
 from pacman_mirrors.functions import apifn
 from pacman_mirrors.functions import filefn
 from pacman_mirrors.functions import httpfn
-from pacman_mirrors.functions import mirrorfn
+from pacman_mirrors.functions import jsonfn
 from pacman_mirrors.functions import miscfn
-from pacman_mirrors.constants import txt
 from pacman_mirrors.functions import validfn
+from pacman_mirrors.mirrors.mirror import Mirror
+from pacman_mirrors.mirrors import mirrorfn
 from pacman_mirrors.translation import i18n
 from pacman_mirrors.translation.custom_help_formatter import CustomHelpFormatter