Changeset 7113

Timestamp:

Mar 29, 2018, 2:44:49 PM (2 years ago)

Author:

jrpelegrina

Message:

WIP in holiday manager API

File:

• holiday-manager/trunk/fuentes/holiday-manager/python3-holidaymanager/HolidayManager.py (modified) (10 diffs)

holiday-manager/trunk/fuentes/holiday-manager/python3-holidaymanager/HolidayManager.py

@@ -17 +17 @@
                 super(HolidayManager, self).__init__()
 
-                self.db=1
+                self.dbg=1
                 self.config_dir=os.path.expanduser("/etc/manageHolidays/")
                 self.config_file=os.path.join(self.config_dir,"holiday_list")
@@ -103 +103 @@
                 info=self.holiday_list.copy()
 
+                '''
                 if "-" in day:
                         intervalId=self._get_interval_id()
-                        tmp=day.split("-")
-                        date1=datetime.strptime(tmp[0],'%d/%m/%Y')
-                        date2=datetime.strptime(tmp[1],'%d/%m/%Y')
-                        delta=date2-date1
-                        for i in range(delta.days + 1):
-                                tmp_day=(date1 + timedelta(days=i)).strftime('%d/%m/%Y')
-                                info[tmp_day]={}
-                                info[tmp_day]["description"]=description
-                                info[tmp_day]["intervalId"]=intervalId
+                        list_days=self.get_days_inrange(day)
+                        for i in list_days:
+                                info[i]={}
+                                info[i]["description"]=description
+                                info[i]["intervalId"]=intervalId
 
                 else:
@@ -119 +116 @@
                         info[day]["description"]=description
                         info[day]["intervalId"]=""
-
-
+                '''
+                info[day]={}
+                info[day]["description"]=description
+                
                 result=self._write_conf(info)
                 
                 if result["result"]:
                         shutil.move(self.block_file,self.config_file)
+                        self.holiday_list=info
                         
                 return result   
@@ -158 +158 @@
                 info=self.holiday_list.copy()
 
+                '''
                 if "-" in day:
-                        delete_days=[]
-                        tmp=day.split("-")
-                        date1=datetime.strptime(tmp[0],'%d/%m/%Y')
-                        date2=datetime.strptime(tmp[1],'%d/%m/%Y')
-                        delta=date2-date1
-                        for i in range(delta.days + 1):
-                                tmp_day=(date1 + timedelta(days=i)).strftime('%d/%m/%Y')
-                                delete_days.append(tmp_day)
-
+                        delete_days=self.get_days_inrange(day)
                         for item in delete_days:
                                 try:
@@ -181 +174 @@
                                 self._debug("Delete day: ",str(e))
                                 pass    
+                '''
+                try:
+                        info.pop(day)
+                except Exception as e:
+                        self._debug("Delete day: ",str(e))
+                pass
 
                 result=self._write_conf(info)
@@ -186 +185 @@
                 if result["result"]:
                         shutil.move(self.block_file,self.config_file)
-                        
+                        self.holiday_list=info
+
                 return result   
                                 
@@ -192 +192 @@
 
 
+        def get_days_inrange(self,day):
+
+                list_days=[]
+                tmp=day.split("-")
+                date1=datetime.strptime(tmp[0],'%d/%m/%Y')
+                date2=datetime.strptime(tmp[1],'%d/%m/%Y')
+                delta=date2-date1
+                for i in range(delta.days + 1):
+                        tmp_day=(date1 + timedelta(days=i)).strftime('%d/%m/%Y')
+                        list_days.append(tmp_day)
+
+                return list_days        
+
+        #def get_days_inrange   
+
         def is_holiday(self,day):
 
-
-                holiday_days=self.holiday_list.keys()
+                holiday_days=[]
+                for item in self.holiday_list:
+                        tmp_list=[]
+                        if "-" in item:
+                                tmp_list=self.get_days_inrange(item)
+                                holiday_days=holiday_days+tmp_list
+                        else:
+                                holiday_days.append(item)
+
+
+                #holiday_days=self.holiday_list.keys()
 
                 if day in holiday_days:
@@ -214 +238 @@
                 if result["result"]:
                         shutil.move(self.block_file,self.config_file)
-                        
+                        self.holiday_list=info
+
                 return result   
 
@@ -220 +245 @@
 
 
-        def import_holiday_list(self,orig_path,dest_path):
+        def import_holiday_list(self,orig_path):
                 
                 '''
@@ -233 +258 @@
                                 read=json.load(f)
                                 if not os.path.exists(self.block_file):
-                                        shutil.copy2(orig_path,self.config_dir)
+                                        shutil.copyfile(orig_path,self.config_file)
                                         f.close()
                                         return {"result":True,"code":6,"info":""}