Skip to content

Commit 5680a06

Browse files
evaaryevaary
committed
[rework]
réorganisation
1 parent 9d25b9f commit 5680a06

15 files changed

+55
-55
lines changed

‎Main.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
from app.boite_a_bonheur.ScraperTypeEnum import ScrapperType
3-
from app.ucs.UserConfigFile import UserConfigFile
4-
from app.ucs.ucf_checker_exceptions import UCFCheckerException
3+
from app.UserConfigFile import UserConfigFile
4+
from app.exceptions.ucf_checker_exceptions import UCFCheckerException
55
from app.boite_a_bonheur.utils import to_csv, to_json
6-
from app.scrappers.scrappers_module import MeteoScrapper
6+
from app.scrappers_module import MeteoScrapper
77

88

99
class Main:

‎app/ucs/UCFChecker.py ‎app/UCFChecker.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
from app.boite_a_bonheur.utils import from_json
44
from app.boite_a_bonheur.UCFParameterEnum import (UCFParameter,
55
UCFParameterEnumMember)
6-
from app.ucs.ucf_checker_exceptions import (DateFieldException,
7-
DaysDateException,
8-
MonthsDateException,
9-
RequiredDateFieldException,
10-
UnavailableScrapperException,
11-
NoConfigFoundException,
12-
NotAJsonFileException,
13-
NotAJsonObjectException,
14-
NotAJsonListException,
15-
EmptyConfigFileException,
16-
ScrapperUCException,
17-
CommonStrFieldException,
18-
SpecificStrFieldException,
19-
YearsDateException)
6+
from app.exceptions.ucf_checker_exceptions import (DateFieldException,
7+
DaysDateException,
8+
MonthsDateException,
9+
RequiredDateFieldException,
10+
UnavailableScrapperException,
11+
NoConfigFoundException,
12+
NotAJsonFileException,
13+
NotAJsonObjectException,
14+
NotAJsonListException,
15+
EmptyConfigFileException,
16+
ScrapperUCException,
17+
CommonStrFieldException,
18+
SpecificStrFieldException,
19+
YearsDateException)
2020

2121

2222
class UCFChecker:

‎app/ucs/UserConfigFile.py ‎app/UserConfigFile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import copy
22
from app.boite_a_bonheur.UCFParameterEnum import UCFParameter
3-
from app.ucs.UCFChecker import UCFChecker
4-
from app.ucs.ucs_module import ScrapperUC
3+
from app.UCFChecker import UCFChecker
4+
from app.ucs_module import ScrapperUC
55

66

77
class UserConfigFile:

‎app/boite_a_bonheur/MonthsEnum.py ‎app/boite_a_bonheur/MonthEnum.py

File renamed without changes.

‎app/scrappers/scrapping_exceptions.py ‎app/exceptions/scrapping_exceptions.py

File renamed without changes.

‎app/ucs/ucf_checker_exceptions.py ‎app/exceptions/ucf_checker_exceptions.py

File renamed without changes.

‎app/scrappers/scrappers_module.py ‎app/scrappers_module.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
from typing import List
88
from time import perf_counter
99

10-
from app.scrappers.scrapping_exceptions import (ProcessException,
11-
ReworkException,
12-
ScrapException,
13-
HtmlPageException)
14-
from app.ucs.ucs_module import ScrapperUC
15-
from app.tps.tps_module import TaskParameters
10+
from app.exceptions.scrapping_exceptions import (ProcessException,
11+
ReworkException,
12+
ScrapException,
13+
HtmlPageException)
14+
from app.ucs_module import ScrapperUC
15+
from app.tps_module import TaskParameters
1616
from app.boite_a_bonheur.ScraperTypeEnum import ScrapperType
17-
from app.boite_a_bonheur.MonthsEnum import MonthEnum
17+
from app.boite_a_bonheur.MonthEnum import MonthEnum
1818
from requests_html import (Element,
1919
HTMLSession)
2020

‎app/tests/meteociel_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from unittest import TestCase
22
import pandas as pd
3-
from app.scrappers.scrappers_module import MeteocielHourly, MeteocielDaily
4-
from app.ucs.UserConfigFile import UserConfigFile
3+
from app.scrappers_module import MeteocielHourly, MeteocielDaily
4+
from app.UserConfigFile import UserConfigFile
55

66

77
class MeteocielDailyTester(TestCase):

‎app/tests/ogimet_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import numpy as np
44
import pandas as pd
55

6-
from app.scrappers.scrappers_module import (OgimetDaily, OgimetHourly)
7-
from app.ucs.UserConfigFile import UserConfigFile
6+
from app.scrappers_module import (OgimetDaily, OgimetHourly)
7+
from app.UserConfigFile import UserConfigFile
88

99

1010
class OgimetDailyTester(TestCase):

‎app/tests/tps_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from unittest import TestCase
22

3-
from app.ucs.UserConfigFile import UserConfigFile
3+
from app.UserConfigFile import UserConfigFile
44

55

66
class TPsTester(TestCase):

‎app/tests/ucf_checker_tests.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
from unittest import TestCase
22

3-
from app.ucs.UCFChecker import UCFChecker
4-
from app.ucs.ucf_checker_exceptions import (DateFieldException,
5-
DaysDateException,
6-
MonthsDateException,
7-
RequiredDateFieldException,
8-
UnavailableScrapperException,
9-
NoConfigFoundException,
10-
NotAJsonFileException,
11-
NotAJsonObjectException,
12-
NotAJsonListException,
13-
EmptyConfigFileException,
14-
ScrapperUCException,
15-
CommonStrFieldException,
16-
SpecificStrFieldException,
17-
YearsDateException)
3+
from app.UCFChecker import UCFChecker
4+
from app.exceptions.ucf_checker_exceptions import (DateFieldException,
5+
DaysDateException,
6+
MonthsDateException,
7+
RequiredDateFieldException,
8+
UnavailableScrapperException,
9+
NoConfigFoundException,
10+
NotAJsonFileException,
11+
NotAJsonObjectException,
12+
NotAJsonListException,
13+
EmptyConfigFileException,
14+
ScrapperUCException,
15+
CommonStrFieldException,
16+
SpecificStrFieldException,
17+
YearsDateException)
1818

1919

2020
class UCFCheckerTester(TestCase):

‎app/tests/ucs_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from unittest import TestCase
33

44
from app.boite_a_bonheur.ScraperTypeEnum import ScrapperType
5-
from app.ucs.UserConfigFile import UserConfigFile
5+
from app.UserConfigFile import UserConfigFile
66

77

88
class UCsTester(TestCase):

‎app/tests/wunderground_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import numpy as np
44
import pandas as pd
55

6-
from app.scrappers.scrappers_module import WundergroundDaily
7-
from app.ucs.UserConfigFile import UserConfigFile
6+
from app.scrappers_module import WundergroundDaily
7+
from app.UserConfigFile import UserConfigFile
88

99

1010
class WundergroundDailyTester(TestCase):

‎app/tps/tps_module.py ‎app/tps_module.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from string import Template
44

55
from app.boite_a_bonheur.Criteria import Criteria
6-
from app.boite_a_bonheur.MonthsEnum import MonthEnum
6+
from app.boite_a_bonheur.MonthEnum import MonthEnum
77
from app.boite_a_bonheur.ScraperTypeEnum import (ScrapperType,
88
ScrapperTypeEnumMember)
99
from app.boite_a_bonheur.UCFParameterEnum import UCFParameter

‎app/ucs/ucs_module.py ‎app/ucs_module.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
Dict,
66
Generator)
77

8-
from app.boite_a_bonheur.MonthsEnum import MonthEnum
8+
from app.boite_a_bonheur.MonthEnum import MonthEnum
99
from app.boite_a_bonheur.ScraperTypeEnum import ScrapperType
1010
from app.boite_a_bonheur.UCFParameterEnum import UCFParameterEnumMember, UCFParameter
11-
from app.tps.tps_module import (TPBuilder,
12-
TaskParameters)
13-
from app.ucs.UCFChecker import UCFChecker
11+
from app.tps_module import (TPBuilder,
12+
TaskParameters)
13+
from app.UCFChecker import UCFChecker
1414

1515

1616
class ScrapperUC(ABC):
@@ -49,7 +49,7 @@ def days(self):
4949
def from_json(cls, jsono, param_name: UCFParameterEnumMember) -> "ScrapperUC":
5050

5151
if param_name not in UCFParameter.scrappers_parameters():
52-
raise ValueError("ScrapperUC.from_ucf : param_name doit être un des scrappers")
52+
raise ValueError("ScrapperUC.from_ucf : param_name doit être un des exceptions")
5353

5454
if param_name == UCFParameter.WUNDERGROUND:
5555
suc = WundergroundUC.from_json_object(jsono, False)

0 commit comments

Comments
 (0)